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

BUG 2535: Anzeige von Kampfzaubern. 

use sbs_printf where possible.
This commit is contained in:
Enno Rehling 2018-12-09 10:30:33 +01:00
parent d0577a5d6a
commit 230f7ca11f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/reports.c
View File

@ -812,19 +812,14 @@ void bufunit(const faction * f, const unit * u, const faction *fv,
if (book) { if (book) {
selist *ql = book->spells; selist *ql = book->spells;
int qi, header, maxlevel = effskill(u, SK_MAGIC, NULL); int qi, header, maxlevel = effskill(u, SK_MAGIC, NULL);
sbs_strcat(sbp, ". Aura "); sbs_printf(sbp, ". Aura %d/%d", get_spellpoints(u), max_spellpoints(u, NULL));
sbs_strcat(sbp, str_itoa(get_spellpoints(u)));
sbs_strcat(sbp, "/");
sbs_strcat(sbp, str_itoa(max_spellpoints(u, NULL)));
for (header = 0, qi = 0; ql; selist_advance(&ql, &qi, 1)) { for (header = 0, qi = 0; ql; selist_advance(&ql, &qi, 1)) {
spellbook_entry * sbe = (spellbook_entry *)selist_get(ql, qi); spellbook_entry * sbe = (spellbook_entry *)selist_get(ql, qi);
const spell *sp = spellref_get(&sbe->spref); const spell *sp = spellref_get(&sbe->spref);
if (sbe->level <= maxlevel) { if (sbe->level <= maxlevel) {
if (!header) { if (!header) {
sbs_strcat(sbp, ", "); sbs_printf(sbp, ", %s: ", LOC(lang, "nr_spells"));
sbs_strcat(sbp, LOC(lang, "nr_spells"));
sbs_strcat(sbp, ": ");
header = 1; header = 1;
} }
else { else {
@ -840,9 +835,7 @@ void bufunit(const faction * f, const unit * u, const faction *fv,
break; break;
} }
if (i != MAXCOMBATSPELLS) { if (i != MAXCOMBATSPELLS) {
sbs_strcat(sbp, ", "); sbs_printf(sbp, ", %s: ", LOC(lang, "nr_combatspells"));
sbs_strcat(sbp, LOC(lang, "nr_combatspells"));
sbs_strcat(sbp, ": ");
dh = 0; dh = 0;
for (i = 0; i < MAXCOMBATSPELLS; i++) { for (i = 0; i < MAXCOMBATSPELLS; i++) {
const spell *sp; const spell *sp;
@ -857,9 +850,7 @@ void bufunit(const faction * f, const unit * u, const faction *fv,
int sl = get_combatspelllevel(u, i); int sl = get_combatspelllevel(u, i);
sbs_strcat(sbp, spell_name(sp, lang)); sbs_strcat(sbp, spell_name(sp, lang));
if (sl > 0) { if (sl > 0) {
sbs_strcat(sbp, "( "); sbs_printf(sbp, "(%d)", sl);
sbs_strcat(sbp, str_itoa(sl));
sbs_strcat(sbp, ")");
} }
} }
else { else {