From 0440fcc11c879b31c7266f41e25ddad08391f9e0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 31 Dec 2017 13:14:44 +0100 Subject: [PATCH] bug 2400: magicbag preservation --- res/core/common/items.xml | 2 +- src/kernel/faction.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/res/core/common/items.xml b/res/core/common/items.xml index 308a41df2..564e9fafd 100644 --- a/res/core/common/items.xml +++ b/res/core/common/items.xml @@ -46,7 +46,7 @@ - + diff --git a/src/kernel/faction.c b/src/kernel/faction.c index d49bcd877..49186699d 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -408,12 +408,8 @@ void save_special_items(unit *usrc) static int cache; static const char *name = NULL; if (rc_changed(&cache)) { - rc_ghost = rc_find("ghost"); - if (!rc_ghost) { - rc_ghost = get_race(RC_TEMPLATE); - name = "ghost"; - } - assert(rc_ghost); + rc_ghost = get_race(RC_TEMPLATE); + name = "ghost"; } for (u = r->units; u; u = u->next) { if (u->faction == fm) {