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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
conf/eressea.ini
View File

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

2
src/kernel/unit.c
View File

@ -702,7 +702,7 @@ void set_level(unit * u, skill_t sk, int value)
{ {
skill *sv = u->skills; 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)) if (!skill_enabled(sk))
return; return;