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

somehow random_terrain still crashes. oh, and tha familiar stuff was in the 

wrong function
This commit is contained in:
Enno Rehling 2006-01-01 22:20:52 +00:00
parent f8991a844f
commit ba555c842a
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Jamrules
View File

@ -44,8 +44,8 @@ if $(DMALLOC) {
if $(PROFILE) = 1 { if $(PROFILE) = 1 {
Echo Compiling with profiler ; Echo Compiling with profiler ;
CCFLAGS += -pg -g ; CCFLAGS += -pg -ggdb ;
LINKFLAGS += -pg -g ; LINKFLAGS += -pg -ggdb ;
} }
CCFLAGS += -Wall ; CCFLAGS += -Wall ;
@ -121,8 +121,8 @@ rule TargetDirectory
LOCATE_TARGET = $(ALL_LOCATE_TARGET) $(path) ; LOCATE_TARGET = $(ALL_LOCATE_TARGET) $(path) ;
SOURCE_GRIST = $(path) ; SOURCE_GRIST = $(path) ;
if $(DEBUG) = 1 { if $(DEBUG) = 1 {
SubDirCcFlags -g ; SubDirCcFlags -ggdb -O0 ;
SubDirC++Flags -g ; SubDirC++Flags -ggdb -O0 ;
} }
else { else {
SubDirCcFlags -DNDEBUG -O2 ; SubDirCcFlags -DNDEBUG -O2 ;

16
src/common/kernel/race.c
View File

@ -109,13 +109,16 @@ rc_new(const char * zName)
race * race *
rc_add(race * rc) rc_add(race * rc)
{ {
rc->next = races; rc->next = races;
return races = rc; if (rc->init_familiar!=NULL) {
racelist_insert(&familiarraces, rc);
}
return races = rc;
} }
static const char * racealias[2][2] = { static const char * racealias[2][2] = {
{ "skeletton lord", "skeleton lord" }, { "skeletton lord", "skeleton lord" },
{ NULL, NULL } { NULL, NULL }
}; };
race * race *
@ -132,10 +135,7 @@ rc_find(const char * name)
} }
} }
while (rc && !strcmp(rname, rc->_name[0])==0) rc = rc->next; while (rc && !strcmp(rname, rc->_name[0])==0) rc = rc->next;
if (rc->init_familiar!=NULL) { return rc;
racelist_insert(&familiarraces, rc);
}
return rc;
} }
/** dragon movement **/ /** dragon movement **/

1
src/scripts/eressea/xmas2005.lua
View File

@ -14,7 +14,6 @@ function use_stardust(u, amount)
end end
function xmas2005() function xmas2005()
print(get_gamename())
if get_gamename() == "Eressea" then if get_gamename() == "Eressea" then
if not get_flag("xm05") then if not get_flag("xm05") then
print("Es weihnachtet sehr (2005)") print("Es weihnachtet sehr (2005)")