Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

http://eressea.upb.de/mantis/view.php?id=775 

Berge ohne Eisen (und generell Regionen ohne Resourcen).
This commit is contained in:
Enno Rehling 2005-12-19 17:31:27 +00:00
parent 945a60a20c
commit 5c07121a9f
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/kernel/region.c
View File

@ -893,6 +893,7 @@ terraform_region(region * r, const terrain_type * terrain)
} }
r->terrain = terrain; r->terrain = terrain;
terraform_resources(r);
if (!fval(terrain, LAND_REGION)) { if (!fval(terrain, LAND_REGION)) {
if (r->land!=NULL) { if (r->land!=NULL) {

34
src/eressea/korrektur.c
View File

@ -179,13 +179,14 @@ verify_owners(boolean bOnce)
} }
/* make sure that this is done only once! */ /* make sure that this is done only once! */
#define do_once(magic, fun) \ static void
{ \ do_once(const char * magic, int fresult)
attrib * a = find_key(global.attribs, atoi36(magic)); \ {
if (!a) { \ attrib * a = find_key(global.attribs, atoi36(magic));
log_warning(("[do_once] a unique fix %d=\"%s\" was applied.\n", atoi36(magic), magic)); \ if (!a) {
if (fun == 0) a_add(&global.attribs, make_key(atoi36(magic))); \ log_warning(("[do_once] a unique fix %d=\"%s\" was applied.\n", atoi36(magic), magic));
} \ if (fresult == 0) a_add(&global.attribs, make_key(atoi36(magic)));
}
} }
int int
@ -1056,6 +1057,24 @@ fix_familiars(void)
return 0; return 0;
} }
static int
fix_resources(void)
{
int retval = 0;
region * r;
for (r=regions;r;r=r->next) {
if (r->terrain->production!=NULL && r->resources==NULL) {
terraform_resources(r);
if (r->resources!=NULL) {
log_warning(("fixing resources in '%s'\n", regionname(r, NULL)));
retval = -1;
}
}
}
return retval;
}
#define REPORT_NR (1 << O_REPORT) #define REPORT_NR (1 << O_REPORT)
#define REPORT_CR (1 << O_COMPUTER) #define REPORT_CR (1 << O_COMPUTER)
#define REPORT_ZV (1 << O_ZUGVORLAGE) #define REPORT_ZV (1 << O_ZUGVORLAGE)
@ -1185,6 +1204,7 @@ korrektur(void)
fix_demands(); fix_demands();
fix_otherfaction(); fix_otherfaction();
fix_familiars(); fix_familiars();
do_once("tfrs", fix_resources());
/* trade_orders(); */ /* trade_orders(); */
/* immer ausführen, wenn neue Sprüche dazugekommen sind, oder sich /* immer ausführen, wenn neue Sprüche dazugekommen sind, oder sich