forked from github/server
Kein Kampf im .cr
This commit is contained in:
parent
cc35801a19
commit
cbf2d8c679
|
@ -883,8 +883,6 @@ rp_battles(FILE * F, faction * f)
|
|||
centre(F, buf, true);
|
||||
rnl(F);
|
||||
rp_messages(F, bm->msgs, f, 0, true, false);
|
||||
free_messagelist(bm->msgs);
|
||||
free(bm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -325,8 +325,6 @@ extern boolean curse_active(const curse * c);
|
|||
extern const char * oldcursename(int id);
|
||||
extern void register_curses(void);
|
||||
|
||||
#define get_oldcurse(id) \
|
||||
get_curse(a, ct_find(oldcursename(id)))
|
||||
#define is_cursed(a, id, id2) \
|
||||
curse_active(get_curse(a, ct_find(oldcursename(id))))
|
||||
#define get_curseeffect(a, id, id2) \
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "unit.h"
|
||||
#include "race.h"
|
||||
#include "region.h"
|
||||
#include "message.h"
|
||||
#include "plane.h"
|
||||
#include "item.h"
|
||||
#include "group.h"
|
||||
|
@ -179,7 +180,14 @@ destroyfaction(faction * f)
|
|||
unit *u;
|
||||
faction *ff;
|
||||
|
||||
if( !f->alive ) return;
|
||||
if (!f->alive) return;
|
||||
|
||||
while (f->battles) {
|
||||
struct bmsg * bm = f->battles;
|
||||
f->battles = bm->next;
|
||||
free_messagelist(bm->msgs);
|
||||
free(bm);
|
||||
}
|
||||
|
||||
for (u=f->units;u;u=u->nextF) {
|
||||
region * r = u->region;
|
||||
|
|
Loading…
Reference in New Issue