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

Merge branch 'master' of https://github.com/ennorehling/eressea

This commit is contained in:
Enno Rehling 2019-02-02 20:38:11 +01:00
parent af91459fb1 ef8139067e
commit 97a78ad6b0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
s/travis-build
View File

@ -33,8 +33,9 @@ set -e
[ -z $BUILD ] && BUILD=Debug ; export BUILD [ -z $BUILD ] && BUILD=Debug ; export BUILD
# cppcheck_tests # cppcheck_tests
s/cmake-init --db=sqlite s/cmake-init --db=sqlite
s/build cd Debug
cd process scan-build make
cd ../process
make make
cd $ROOT cd $ROOT
inifile inifile

4
src/creport.c
View File

@ -915,7 +915,8 @@ void cr_output_unit(stream *out, const faction * f,
if (fval(u, UFL_HUNGER) && (u->faction == f)) { if (fval(u, UFL_HUNGER) && (u->faction == f)) {
stream_printf(out, "1;hunger\n"); stream_printf(out, "1;hunger\n");
} }
if (is_mage(u)) { mage = get_mage(u);
if (mage) {
stream_printf(out, "%d;Aura\n", get_spellpoints(u)); stream_printf(out, "%d;Aura\n", get_spellpoints(u));
stream_printf(out, "%d;Auramax\n", max_spellpoints_depr(u->region, u)); stream_printf(out, "%d;Auramax\n", max_spellpoints_depr(u->region, u));
} }
@ -957,7 +958,6 @@ void cr_output_unit(stream *out, const faction * f,
} }
/* spells that this unit can cast */ /* spells that this unit can cast */
mage = get_mage(u);
if (mage) { if (mage) {
int maxlevel = effskill(u, SK_MAGIC, NULL); int maxlevel = effskill(u, SK_MAGIC, NULL);
cr_output_spells(out, u, maxlevel); cr_output_spells(out, u, maxlevel);