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

Merge pull request #733 from ennorehling/develop 

BUG 2369 workaround: do not assert at_mage.
This commit is contained in:
Enno Rehling 2017-10-07 21:05:52 +02:00 committed by GitHub
parent 734c355ec3 9d1e1a2e32
commit 06067655a3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/reports.c
View File

@ -819,9 +819,8 @@ spskill(char *buffer, size_t size, const struct locale * lang,
bufp = STRLCPY(bufp, " ", size); bufp = STRLCPY(bufp, " ", size);
if (sv->id == SK_MAGIC) { if (sv->id == SK_MAGIC) {
sc_mage *mage = get_mage_depr(u); sc_mage *mage = get_mage(u);
assert(mage); if (mage && mage->magietyp != M_GRAY) {
if (mage->magietyp != M_GRAY) {
bufp = STRLCPY(bufp, LOC(lang, mkname("school", bufp = STRLCPY(bufp, LOC(lang, mkname("school",
magic_school[mage->magietyp])), size); magic_school[mage->magietyp])), size);
bufp = STRLCPY(bufp, " ", size); bufp = STRLCPY(bufp, " ", size);