From 5f3c13521e87731c1fc98e21fb1d2040958ff091 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Fri, 20 May 2005 22:32:53 +0000
Subject: [PATCH] Type-warnings entfernt, die corwins letzter commit erzeugte.

---
 src/common/gamecode/laws.c    | 2 +-
 src/common/kernel/xmlreader.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 55a777a87..3fa22c616 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -3362,7 +3362,7 @@ maxunits(faction *f)
 
 		for(f2 = factions; f2; f2 = f2->next) {
 			if(f2->alliance == f->alliance) {
-				mult += 0.4 * fspecial(f2, FS_ADMINISTRATOR);
+				mult += 0.4f * fspecial(f2, FS_ADMINISTRATOR);
 			}
 		}
 		return (int) (global.maxunits * mult);
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 547491a06..5735f019b 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -1178,14 +1178,7 @@ parse_main(xmlDocPtr doc)
     xmlFree(property);
   }
  
-	global.unitsperalliance = false;
-	property = xmlGetProp(node, BAD_CAST "unitsperalliance");
-  if (property!=NULL) {
-		if(!strcmp(property, "yes")) {
-	    global.unitsperalliance = true;
-		}
-    xmlFree(property);
-  }
+  global.unitsperalliance = xml_bvalue(node, "unitsperalliance", false);
 
   property = xmlGetProp(node, BAD_CAST "units");
   if (property!=NULL) {