forked from github/server
somehow random_terrain still crashes. oh, and tha familiar stuff was in the
wrong function
This commit is contained in:
parent
f8991a844f
commit
ba555c842a
|
@ -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 ;
|
||||
|
|
|
@ -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 **/
|
||||
|
|
|
@ -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)")
|
||||
|
|
Loading…
Reference in New Issue