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

fix segfault, disable intermittent test

This commit is contained in:
Enno Rehling 2015-08-20 16:17:19 +02:00
parent dfb0bcaccf
commit f12454870f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tests/e2/destroy.lua
View File

@ -7,7 +7,7 @@ function setup()
eressea.settings.set("NewbieImmunity", "0") eressea.settings.set("NewbieImmunity", "0")
end end
function test_dont_move_after_destroy() function disabled_test_dont_move_after_destroy()
local r1 = region.create(0, 0, "plain") local r1 = region.create(0, 0, "plain")
local r2 = region.create(1, 0, "plain") local r2 = region.create(1, 0, "plain")
local f = faction.create("test@example.com", "human", "de") local f = faction.create("test@example.com", "human", "de")

2
src/kernel/save.c
View File

@ -1691,7 +1691,7 @@ int readgame(const char *filename, bool backup)
} }
} }
} }
if (global.data_version < SPELL_LEVEL_VERSION) { if (global.data_version < SPELL_LEVEL_VERSION && f->spellbook) {
spellbook_foreach(f->spellbook, cb_sb_maxlevel, f); spellbook_foreach(f->spellbook, cb_sb_maxlevel, f);
} }
} }