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

http://eressea.upb.de/mantis/view.php?id=558 

Kein Kampf im .cr
This commit is contained in:
Enno Rehling 2005-06-12 16:34:50 +00:00
parent cc35801a19
commit cbf2d8c679
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/report.c
View File

@ -883,8 +883,6 @@ rp_battles(FILE * F, faction * f)
centre(F, buf, true); centre(F, buf, true);
rnl(F); rnl(F);
rp_messages(F, bm->msgs, f, 0, true, false); rp_messages(F, bm->msgs, f, 0, true, false);
free_messagelist(bm->msgs);
free(bm);
} }
} }
} }

2
src/common/kernel/curse.h
View File

@ -325,8 +325,6 @@ extern boolean curse_active(const curse * c);
extern const char * oldcursename(int id); extern const char * oldcursename(int id);
extern void register_curses(void); extern void register_curses(void);
#define get_oldcurse(id) \
get_curse(a, ct_find(oldcursename(id)))
#define is_cursed(a, id, id2) \ #define is_cursed(a, id, id2) \
curse_active(get_curse(a, ct_find(oldcursename(id)))) curse_active(get_curse(a, ct_find(oldcursename(id))))
#define get_curseeffect(a, id, id2) \ #define get_curseeffect(a, id, id2) \

10
src/common/kernel/faction.c
View File

@ -18,6 +18,7 @@
#include "unit.h" #include "unit.h"
#include "race.h" #include "race.h"
#include "region.h" #include "region.h"
#include "message.h"
#include "plane.h" #include "plane.h"
#include "item.h" #include "item.h"
#include "group.h" #include "group.h"
@ -179,7 +180,14 @@ destroyfaction(faction * f)
unit *u; unit *u;
faction *ff; 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) { for (u=f->units;u;u=u->nextF) {
region * r = u->region; region * r = u->region;