forked from github/server
bugfix removed orders. still crashing on save due to broken attributes of faction rr
This commit is contained in:
parent
55eb4270e0
commit
c6f973d822
|
@ -744,7 +744,7 @@ giveunit(region * r, unit * u, unit * u2, strlist * S)
|
|||
strlist * o = u->orders;
|
||||
u->orders = o->next;
|
||||
gc_add(o->s); /* delete it later */
|
||||
free(o);
|
||||
o->s = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -599,10 +599,11 @@ typus2race(unsigned char typus)
|
|||
}
|
||||
|
||||
boolean
|
||||
is_persistent(const char *s, const struct locale *lang)
|
||||
is_persistent(const char *s, const struct locale *lang)
|
||||
{
|
||||
if (s==NULL) return false;
|
||||
#ifdef AT_PERSISTENT
|
||||
if(*s == '@') return true;
|
||||
if(*s == '@') return true;
|
||||
#endif /* Nur kurze Befehle! */
|
||||
switch(igetkeyword(s, lang)) {
|
||||
case K_BUY:
|
||||
|
|
|
@ -1968,21 +1968,6 @@ fix_herbs(void)
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
#include <modules/gmcmd.h>
|
||||
#include <attributes/gm.h>
|
||||
void setup_gm_faction(void);
|
||||
static void
|
||||
set_atgm(faction * f)
|
||||
{
|
||||
plane * p = planes;
|
||||
if (!f) return;
|
||||
while (p) {
|
||||
a_add(&f->attribs, make_gm(p));
|
||||
p = p->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#include <event.h>
|
||||
#include <triggers/timeout.h>
|
||||
|
|
|
@ -14,7 +14,8 @@ INCLUDES += \
|
|||
-I../common/util \
|
||||
-I../common/kernel \
|
||||
-I../common/spells \
|
||||
-I../common
|
||||
-I../common \
|
||||
-I..
|
||||
|
||||
LIBS += \
|
||||
-le-modules \
|
||||
|
@ -26,6 +27,7 @@ LIBS += \
|
|||
-le-attributes \
|
||||
-le-util \
|
||||
-lm
|
||||
|
||||
ifeq ($(NCURSES), 1)
|
||||
LIBS += -lncurses
|
||||
else
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
|
||||
#include <item.h>
|
||||
#include <faction.h>
|
||||
#include <race.h>
|
||||
#include <region.h>
|
||||
#include <reports.h>
|
||||
#include <save.h>
|
||||
|
@ -1303,11 +1304,14 @@ main(int argc, char *argv[])
|
|||
kernel_init();
|
||||
|
||||
init_triggers();
|
||||
|
||||
debug_language("locales.log");
|
||||
init_locales();
|
||||
|
||||
init_races();
|
||||
init_attributes();
|
||||
init_spells();
|
||||
|
||||
init_resources();
|
||||
/* init_weapons(); */
|
||||
init_items();
|
||||
|
||||
init_museum();
|
||||
|
|
Loading…
Reference in New Issue