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

Type-warnings entfernt, die corwins letzter commit erzeugte.

This commit is contained in:
Enno Rehling 2005-05-20 22:32:53 +00:00
parent 9515363c56
commit 5f3c13521e
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/laws.c
View File

@ -3362,7 +3362,7 @@ maxunits(faction *f)
for(f2 = factions; f2; f2 = f2->next) { for(f2 = factions; f2; f2 = f2->next) {
if(f2->alliance == f->alliance) { if(f2->alliance == f->alliance) {
mult += 0.4 * fspecial(f2, FS_ADMINISTRATOR); mult += 0.4f * fspecial(f2, FS_ADMINISTRATOR);
} }
} }
return (int) (global.maxunits * mult); return (int) (global.maxunits * mult);

9
src/common/kernel/xmlreader.c
View File

@ -1178,14 +1178,7 @@ parse_main(xmlDocPtr doc)
xmlFree(property); xmlFree(property);
} }
global.unitsperalliance = false; global.unitsperalliance = xml_bvalue(node, "unitsperalliance", false);
property = xmlGetProp(node, BAD_CAST "unitsperalliance");
if (property!=NULL) {
if(!strcmp(property, "yes")) {
global.unitsperalliance = true;
}
xmlFree(property);
}
property = xmlGetProp(node, BAD_CAST "units"); property = xmlGetProp(node, BAD_CAST "units");
if (property!=NULL) { if (property!=NULL) {