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

unit repair is broken, kill it 

http://bugs.eressea.de/view.php?id=1970
This commit is contained in:
Enno Rehling 2013-05-02 06:07:42 +02:00
parent efc7373fb9
commit ebf9fe2c67
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/kernel/save.c
View File

@ -1493,31 +1493,6 @@ void writefaction(struct storage *store, const faction * f)
write_spellbook(f->spellbook, store); write_spellbook(f->spellbook, store);
} }
static void repair_unit(unit * u) {
static const race * rctoad;
if (!rctoad) rctoad = rc_find("toad");
if (u_race(u)==rctoad) {
int found = 0;
attrib * a = a_find(u->attribs, &at_eventhandler);
while (!found && a && a->type==&at_eventhandler) {
struct trigger ** tlist = get_triggers(a, "timer");
while (!found && tlist && *tlist) {
trigger * t = *tlist;
if (strcmp("changerace", t->type->name)==0) {
found = 1;
}
tlist = &t->next;
}
a = a->next;
}
if (!found) {
u_setrace(u, u->faction->race);
log_warning("This toad did not have a changerace trigger: %s\n", unitname(u));
}
}
}
int readgame(const char *filename, int mode, int backup) int readgame(const char *filename, int mode, int backup)
{ {
int i, n, p; int i, n, p;
@ -1743,7 +1718,6 @@ int readgame(const char *filename, int mode, int backup)
unit *u = read_unit(store); unit *u = read_unit(store);
sc_mage *mage; sc_mage *mage;
repair_unit(u);
assert(u->region == NULL); assert(u->region == NULL);
u->region = r; u->region = r;
*up = u; *up = u;