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

Doppelanzeige Nestwärme, Bauernblut. 

CR Version 64, Mallornschößlinge
This commit is contained in:
Enno Rehling 2002-02-24 10:04:47 +00:00
parent be4b35d87f
commit c1c70b47ec
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/gamecode/creport.c
View File

@ -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

4
src/common/kernel/item.c
View File

@ -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);

5
src/res/de/messages.xml
View File

@ -171,6 +171,11 @@
<text locale="en">young trees</text>
</message>
<message name="rm_youngmallorn">
<text locale="de">Mallornschößlinge</text>
<text locale="en">young mallorn</text>
</message>
<message name="rm_trees">
<text locale="de">Bäume</text>
<text locale="en">trees</text>