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

bugfix mapper, conquest rules

This commit is contained in:
Enno Rehling 2003-05-27 21:51:36 +00:00
parent 53ebc4c0ce
commit 2e1537cb2c
5 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,7 @@ alliancevictory(void)
const struct building_type * btype = bt_find("stronghold"); const struct building_type * btype = bt_find("stronghold");
region * r = regions; region * r = regions;
alliance * al = alliances; alliance * al = alliances;
if (btype==NULL) return;
while (r!=NULL) { while (r!=NULL) {
building * b = r->buildings; building * b = r->buildings;
while (b!=NULL) { while (b!=NULL) {

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

@ -67,7 +67,6 @@ bt_find(const char* name)
btl = buildingtypes; btl = buildingtypes;
while (btl && strncasecmp(btl->type->_name, name, strlen(name))) btl = btl->next; while (btl && strncasecmp(btl->type->_name, name, strlen(name))) btl = btl->next;
} }
assert(btl);
return btl?btl->type:NULL; return btl?btl->type:NULL;
} }

1
src/common/modules/alliance.c
View File

@ -243,6 +243,7 @@ alliancevictory(void)
const struct building_type * btype = bt_find("stronghold"); const struct building_type * btype = bt_find("stronghold");
region * r = regions; region * r = regions;
alliance * al = alliances; alliance * al = alliances;
if (btype==NULL) return;
while (r!=NULL) { while (r!=NULL) {
building * b = r->buildings; building * b = r->buildings;
while (b!=NULL) { while (b!=NULL) {

2
src/common/modules/score.c
View File

@ -293,7 +293,7 @@ score(void)
if (token!=NULL) { if (token!=NULL) {
unit * u = f->units; unit * u = f->units;
while (u!=NULL) { while (u!=NULL) {
const item ** iitem = i_find(&u->items, token); item ** iitem = i_find(&u->items, token);
if (iitem!=NULL && *iitem!=NULL) { if (iitem!=NULL && *iitem!=NULL) {
grails += (*iitem)->number; grails += (*iitem)->number;
} }

2
src/mapper/map_partei.c
View File

@ -322,7 +322,7 @@ read_newfactions(const char * filename)
#ifdef ALLIANCES #ifdef ALLIANCES
int alliance; int alliance;
/* email;race;locale;startbonus;subscription;alliance */ /* email;race;locale;startbonus;subscription;alliance */
if (fscanf(F, "%s %s %s %d %s %d %d", email, race, lang, &bonus, &subscription, password, &alliance)<=0) break; if (fscanf(F, "%s %s %s %d %d %s %d", email, race, lang, &bonus, &subscription, password, &alliance)<=0) break;
#else #else
/* email;race;locale;startbonus;subscription */ /* email;race;locale;startbonus;subscription */
if (fscanf(F, "%s %s %s %d %d %s", email, race, lang, &bonus, &subscription, password)<=0) break; if (fscanf(F, "%s %s %s %d %d %s", email, race, lang, &bonus, &subscription, password)<=0) break;