diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index 4b7c9984b..ad9167d64 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -76,7 +76,7 @@ extern const char *spelldata[]; extern int quiet; /* globals */ -#define C_REPORT_VERSION 63 +#define C_REPORT_VERSION 64 #define TAG_LOCALE "de" #ifdef TAG_LOCALE @@ -1041,10 +1041,11 @@ report_computer(FILE * F, faction * f, const seen_region * seen, if (fval(r, RF_MALLORN) && (trees > 0 || ytrees > 0)) fprintf(F, "1;Mallorn\n"); # endif - if (ytrees) pos = report_resource(pos, "rm_youngtrees", f->locale, ytrees, -1); if (!fval(r, RF_MALLORN)) { + if (ytrees) pos = report_resource(pos, "rm_youngtrees", f->locale, ytrees, -1); if (trees) pos = report_resource(pos, "rm_trees", f->locale, trees, -1); } else { + if (ytrees) pos = report_resource(pos, "rm_youngmallorn", f->locale, ytrees, -1); if (trees) pos = report_resource(pos, "rm_mallorn", f->locale, trees, -1); } #else diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index 5c2ac01c6..aecb32a7a 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -1887,8 +1887,6 @@ use_warmthpotion(struct unit *u, const struct potion_type *ptype, const char *cm assert(ptype==oldpotiontype[P_WARMTH]); if (old_race(u->faction->race) == RC_INSECT) { fset(u, FL_WARMTH); - ADDMSG(&u->faction->msgs, msg_message("usepotion", - "unit potion", u, ptype->itype->rtype)); } else { /* nur für insekten: */ cmistake(u, cmd, 163, MSG_EVENT); @@ -1907,8 +1905,6 @@ use_bloodpotion(struct unit *u, const struct potion_type *ptype, const char *cmd attrib * a = (attrib*)a_find(u->attribs, &at_bauernblut); if (!a) a = a_add(&u->attribs, a_new(&at_bauernblut)); a->data.i += 100; - ADDMSG(&u->faction->msgs, msg_message("usepotion", - "unit potion", u, ptype->itype->rtype)); } else { /* bekommt nicht: */ cmistake(u, cmd, 165, MSG_EVENT); diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml index 63e0b9551..8151566ee 100644 --- a/src/res/de/messages.xml +++ b/src/res/de/messages.xml @@ -171,6 +171,11 @@ young trees + + Mallornschößlinge + young mallorn + + Bäume trees