diff --git a/src/Jamrules b/src/Jamrules index d929d2ebb..df9c50026 100644 --- a/src/Jamrules +++ b/src/Jamrules @@ -44,8 +44,8 @@ if $(DMALLOC) { if $(PROFILE) = 1 { Echo Compiling with profiler ; - CCFLAGS += -pg -g ; - LINKFLAGS += -pg -g ; + CCFLAGS += -pg -ggdb ; + LINKFLAGS += -pg -ggdb ; } CCFLAGS += -Wall ; @@ -121,8 +121,8 @@ rule TargetDirectory LOCATE_TARGET = $(ALL_LOCATE_TARGET) $(path) ; SOURCE_GRIST = $(path) ; if $(DEBUG) = 1 { - SubDirCcFlags -g ; - SubDirC++Flags -g ; + SubDirCcFlags -ggdb -O0 ; + SubDirC++Flags -ggdb -O0 ; } else { SubDirCcFlags -DNDEBUG -O2 ; diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c index ca676ea33..63b4867d6 100644 --- a/src/common/kernel/race.c +++ b/src/common/kernel/race.c @@ -109,13 +109,16 @@ rc_new(const char * zName) race * rc_add(race * rc) { - rc->next = races; - return races = rc; + rc->next = races; + if (rc->init_familiar!=NULL) { + racelist_insert(&familiarraces, rc); + } + return races = rc; } static const char * racealias[2][2] = { - { "skeletton lord", "skeleton lord" }, - { NULL, NULL } + { "skeletton lord", "skeleton lord" }, + { NULL, NULL } }; race * @@ -132,10 +135,7 @@ rc_find(const char * name) } } while (rc && !strcmp(rname, rc->_name[0])==0) rc = rc->next; - if (rc->init_familiar!=NULL) { - racelist_insert(&familiarraces, rc); - } - return rc; + return rc; } /** dragon movement **/ diff --git a/src/scripts/eressea/xmas2005.lua b/src/scripts/eressea/xmas2005.lua index 0c8b779d4..21ee5b47b 100644 --- a/src/scripts/eressea/xmas2005.lua +++ b/src/scripts/eressea/xmas2005.lua @@ -14,7 +14,6 @@ function use_stardust(u, amount) end function xmas2005() - print(get_gamename()) if get_gamename() == "Eressea" then if not get_flag("xm05") then print("Es weihnachtet sehr (2005)")