fix segmentation fault in new assert (units without a faction)

This commit is contained in:
Enno Rehling 2014-10-31 22:20:07 +01:00
parent 17e86ab6cd
commit a29e6a7f40
2 changed files with 15 additions and 14 deletions

View File

@ -1,18 +1,19 @@
[eressea]
base = .
report = reports
verbose = 0
lomem = 0
debug = 0
memcheck = 0
locales = de,en
;game_id = 0
base = .
report = reports
verbose = 0
lomem = 0
debug = 0
memcheck = 0
locales = de,en
[lua]
install = ../git
paths = ../git/lunit:../git/scripts
maxnmrs = 20
rules = e2 ; can use -r to override
install = ../git
paths = lunit:scripts
maxnmrs = 20
rules = e2
[editor]
color = 1
color = 1

View File

@ -702,7 +702,7 @@ void set_level(unit * u, skill_t sk, int value)
{
skill *sv = u->skills;
assert(sk != SK_MAGIC || is_monsters(u->faction) || u->number == 1);
assert(sk != SK_MAGIC || !u->faction || is_monsters(u->faction) || u->number == 1);
if (!skill_enabled(sk))
return;