- Diverser Kleinkram

src/common/kernel/battle.c

@@ -3850,7 +3850,7 @@ damage_unit(unit *u, const char *dam, boolean armor, boolean magic)
 
 	/* Auswirkungen */
 	for (i=0; i<u->number; i++) {
-		if (hp[i] < 0){
+		if (hp[i] <= 0){
 			heiltrank = 0;
 
 			/* Sieben Leben */

src/common/modules/museum.h

@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 #ifndef MUSEUM_MODULE
-#error "must define MUSEUM_MODULE to use this module"
+#warning "must define MUSEUM_MODULE to use this module"
 #endif
 
 extern attrib_type at_warden;

src/eressea/korrektur.c

@@ -1312,7 +1312,7 @@ stats(void)
 				for (itm=u->items;itm;itm=itm->next) {
 					if (itm->number>10000000) {
 						log_error(("unit %s has %d %s\n", unitname(u), itm->number, resourcename(itm->type->rtype, 0)));
-						// itm->number=1;
+						/* itm->number=1; */
 					}
 					s_change(&items, itm->type, itm->number);
 				}
@@ -2831,7 +2831,12 @@ korrektur(void)
 	convert_triggers();
 #endif
 	fix_migrants();
-	no_teurefremde(1);
+	/* In Vin3 können Parteien komplett übergeben werden. */
+#ifdef ENHANCED_QUIT
+	no_teurefremde(0);
+#else
+	no_teurefremde(1)
+#endif
 	update_igjarjuk_quest();
 	fix_allies();
 	update_gmquests(); /* test gm quests */

src/eressea/main.c

@@ -147,7 +147,7 @@ crwritemap(void)
 }
 
 static void
-game_init(void)
+game_init(const char *executable_name)
 {
 	init_triggers();
 	init_xmas();
@@ -163,7 +163,7 @@ game_init(void)
 	register_spells();
 	register_dungeon();
 
-	init_data(xmlfile?xmlfile:"eressea.xml");
+	init_data(xmlfile?xmlfile:executable_name);
 	init_locales();
 
 	init_attributes();
@@ -690,7 +690,7 @@ main(int argc, char *argv[])
 	if ((i=read_datenames(zText))!=0) return i;
 
 	kernel_init();
-	game_init();
+	game_init(basename(argv[0]));
 #if defined(BETA_CODE)
 	/* xml_writeships(); */
 	/* xml_writebuildings(); */

src/eressea@amber.mk

@@ -4,12 +4,12 @@ ifndef ERESSEA
 endif
 
 # Hier definieren, damit nicht '@gcc'
-CC      = gcc-3.2 -D_GNU_SOURCE -ansi -pedantic
-DEPEND  = @gcc-3.2 -MM -MG -r
+CC      = gcc-3.3 -D_GNU_SOURCE -ansi -pedantic
+DEPEND  = @gcc-3.3 -MM -MG -r
 # CC      = gcc -D_GNU_SOURCE
 AR      = ar
 CTAGS   = ctags-exuberant
-LD      = gcc-3.2
+LD      = gcc-3.3
 INSTALL = cp
 CFLAGS  += -march=athlon -minline-all-stringops