Bugfix xml-datei einlesen.

src/common/kernel/eressea.c

@@ -79,7 +79,7 @@
 #include <errno.h>
 
 /* exported variables */
-char	*xmlfile;
+const char *xmlfile = "eressea.xml";
 region  *regions;
 faction *factions;
 settings global;

src/common/kernel/eressea.h

@@ -899,7 +899,7 @@ typedef struct request {
 } request;
 
 extern int turn;
-extern char *xmlfile;
+extern const char *xmlfile;
 
 /* parteinummern */
 extern int *used_faction_ids;

src/common/kernel/save.c

@@ -892,13 +892,12 @@ readgame(const char * filename, int backup)
 		const char *basearg = "(null)";
 
 		rs(F, basefile);
-		if (xmlfile != NULL) {
+		assert(xmlfile != NULL);
-			basearg = strrchr(xmlfile, '/');
+		basearg = strrchr(xmlfile, '/');
-			if (basearg==NULL) {
+		if (basearg==NULL) {
-				basearg = xmlfile;
+			basearg = xmlfile;
-			} else {
+		} else {
-				++basearg;
+			++basearg;
-			}
 		}
 		if (strcmp(basearg, basefile)!=0) {
 			printf("WARNING: xmlfile mismatch:\n");

src/eressea/main.c

@@ -164,7 +164,7 @@ game_init(void)
 	register_spells();
 	register_dungeon();
 
-	init_data(xmlfile?xmlfile:"eressea.xml");
+	init_data(xmlfile);
 	init_locales();
 
 	init_attributes();
@@ -502,8 +502,6 @@ read_args(int argc, char **argv)
 {
 	int i;
 
-	xmlfile = NULL;
-
 	for (i=1;i!=argc;++i) {
 		if (argv[i][0]!='-') {
 			return usage(argv[0], argv[i]);

src/eressea/server.cpp

@@ -178,7 +178,7 @@ game_init(void)
 	register_dungeon();
 #endif
 
-	init_data(xmlfile?xmlfile:"eressea.xml");
+	init_data(xmlfile);
 	init_locales();
 
 	init_attributes();

src/mapper/mapper.c

@@ -1712,7 +1712,7 @@ main(int argc, char *argv[])
 #endif
 /*	register_dungeon(); */
 
-	init_data(xmlfile?xmlfile:"eressea.xml");
+	init_data(xmlfile);
 	init_locales();
 
 	init_resources();