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

http://eressea.upb.de/mantis/view.php?id=962 

"Merkwürdige Fehlermeldung bei Delphin"
Neue Message-Funktion, die den Terraintyp einer Region ausgibt.
This commit is contained in:
Enno Rehling 2006-07-25 09:21:20 +00:00
parent 5317da7512
commit 9f146d1a07
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/gamecode/report.c
View File

@ -2922,6 +2922,19 @@ eval_region(struct opstack ** stack, const void * userdata) /* region -> string
opush(stack, var);
}
static void
eval_terrain(struct opstack ** stack, const void * userdata) /* region -> string */
{
const struct faction * f = (const struct faction *)userdata;
const struct region * r = (const struct region *)opop(stack).v;
const char * c = LOC(f->locale, terrain_name(r));
size_t len = strlen(c);
variant var;
var.v = strcpy(balloc(len+1), c);
opush(stack, var);
}
static void
eval_ship(struct opstack ** stack, const void * userdata) /* ship -> string */
{
@ -3091,6 +3104,7 @@ report_init(void)
/* register functions that turn message contents to readable strings */
add_function("alliance", &eval_alliance);
add_function("region", &eval_region);
add_function("terrain", &eval_terrain);
add_function("weight", &eval_weight);
add_function("resource", &eval_resource);
add_function("race", &eval_race);

12
src/res/messages.xml
View File

@ -1969,18 +1969,18 @@
<arg name="unit" type="unit"/>
<arg name="direction" type="direction"/>
</type>
<text locale="de">"$unit($unit) entdeckt dass im $direction($direction) Ozean ist."</text>
<text locale="fr">"$unit($unit) discovered that an Ocean lies in the $direction($direction)."</text>
<text locale="en">"$unit($unit) discovered that an Ocean lies in the $direction($direction)."</text>
<text locale="de">"$unit($unit) entdeckt dass im $direction($direction) $terrain($region) ist."</text>
<text locale="fr">"$unit($unit) discovered that an ocean lies in the $direction($direction)."</text>
<text locale="en">"$unit($unit) discovered that an ocean lies in the $direction($direction)."</text>
</message>
<message name="detectocean" section="movement">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
</type>
<text locale="de">"$unit($unit) entdeckt, dass $region($region) Ozean ist."</text>
<text locale="fr">"$unit($unit) discovered that $region($region) is Ocean."</text>
<text locale="en">"$unit($unit) discovered that $region($region) is Ocean."</text>
<text locale="de">"$unit($unit) entdeckt, dass $region($region) $terrain($region) ist."</text>
<text locale="fr">"$unit($unit) discovered that $region($region) is $terrain($region)."</text>
<text locale="en">"$unit($unit) discovered that $region($region) is $terrain($region)."</text>
</message>
<message name="sailnolandingstorm" section="movement">
<type>