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=782 

Issue: 782
This commit is contained in:
Enno Rehling 2006-07-26 14:50:05 +00:00
parent 8df3857e9a
commit 594a415276
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1256,7 +1256,7 @@ report_template(const char * filename, report_context * ctx)
rps_nowrap(F, ""); rps_nowrap(F, "");
rnl(F); rnl(F);
sprintf(buf, "; ECHECK %s-w4 -r%d -v%s", (f->options & Pow(O_SILBERPOOL)) ? "-l " : "", sprintf(buf, "; ECHECK %s-w4 -r%d -v%s", (f->options & want(O_SILBERPOOL)) ? "-l " : "",
f->race->recruitcost, ECHECK_VERSION); f->race->recruitcost, ECHECK_VERSION);
/* -v3.4: ECheck Version 3.4.x */ /* -v3.4: ECheck Version 3.4.x */
rps_nowrap(F, buf); rps_nowrap(F, buf);
@ -1748,7 +1748,7 @@ report_plaintext(const char * filename, report_context * ctx)
attrib *a; attrib *a;
message * m; message * m;
unsigned char op; unsigned char op;
int ix = Pow(O_STATISTICS); int ix = want(O_STATISTICS);
int wants_stats = (f->options & ix); int wants_stats = (f->options & ix);
FILE * F = fopen(filename, "wt"); FILE * F = fopen(filename, "wt");
seen_region * sr = NULL; seen_region * sr = NULL;
@ -1892,7 +1892,7 @@ report_plaintext(const char * filename, report_context * ctx)
sprintf(buf, "%s:", LOC(f->locale, "nr_options")); sprintf(buf, "%s:", LOC(f->locale, "nr_options"));
for (op = 0; op != MAXOPTIONS; op++) { for (op = 0; op != MAXOPTIONS; op++) {
if (f->options & (int) pow(2, op)) { if (f->options & want(op)) {
scat(" "); scat(" ");
scat(LOC(f->locale, options[op])); scat(LOC(f->locale, options[op]));
#ifdef AT_OPTION #ifdef AT_OPTION
@ -2843,6 +2843,19 @@ eval_unit(struct opstack ** stack, const void * userdata) /* unit -> string */
opush(stack, var); opush(stack, var);
} }
static void
eval_unit_dative(struct opstack ** stack, const void * userdata) /* unit -> string */
{
const struct faction * f = (const struct faction *)userdata;
const struct unit * u = (const struct unit *)opop(stack).v;
const char * c = u?unitname(u):LOC(f->locale, "unknown_unit_dative");
size_t len = strlen(c);
variant var;
var.v = strcpy(balloc(len+1), c);
opush(stack, var);
}
static void static void
eval_spell(struct opstack ** stack, const void * userdata) /* unit -> string */ eval_spell(struct opstack ** stack, const void * userdata) /* unit -> string */
{ {
@ -3111,6 +3124,7 @@ report_init(void)
add_function("faction", &eval_faction); add_function("faction", &eval_faction);
add_function("ship", &eval_ship); add_function("ship", &eval_ship);
add_function("unit", &eval_unit); add_function("unit", &eval_unit);
add_function("unit.dative", &eval_unit_dative);
add_function("unit.name", &eval_unitname); add_function("unit.name", &eval_unitname);
add_function("unit.id", &eval_unitid); add_function("unit.id", &eval_unitid);
add_function("building", &eval_building); add_function("building", &eval_building);

10
src/res/de/strings.xml
View File

@ -656,21 +656,25 @@
<!--Verschiedenes --> <!--Verschiedenes -->
<string name="an_unknown_building"> <string name="an_unknown_building">
<text locale="de">eine unbekanntes Gebäude</text> <text locale="de">ein unbekanntes Gebäude</text>
<text locale="en">an unknown building</text> <text locale="en">an unknown building</text>
</string> </string>
<string name="an_unknown_spell"> <string name="an_unknown_spell">
<text locale="de">eine unbekannter zauber</text> <text locale="de">ein unbekannter zauber</text>
<text locale="en">an unknown spell</text> <text locale="en">an unknown spell</text>
</string> </string>
<string name="an_unknown_ship"> <string name="an_unknown_ship">
<text locale="de">eine unbekanntes Schiff</text> <text locale="de">ein unbekanntes Schiff</text>
<text locale="en">an unknown ship</text> <text locale="en">an unknown ship</text>
</string> </string>
<string name="an_unknown_unit"> <string name="an_unknown_unit">
<text locale="de">eine unbekannte Einheit</text> <text locale="de">eine unbekannte Einheit</text>
<text locale="en">an unknown unit</text> <text locale="en">an unknown unit</text>
</string> </string>
<string name="unknown_unit_dative">
<text locale="de">einer unbekannten Einheit</text>
<text locale="en">an unknown unit</text>
</string>
<!--Meldungssektionen --> <!--Meldungssektionen -->
<string name="section_events"> <string name="section_events">

28
src/res/messages.xml
View File

@ -625,7 +625,7 @@
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="string" type="string"/> <arg name="string" type="string"/>
</type> </type>
<text locale="de">"Eine Botschaft von $unit($sender) aus $region($region): '$string'"</text> <text locale="de">"Eine Botschaft von $unit.dative($sender) aus $region($region): '$string'"</text>
<text locale="en">"A message by $unit($sender) from $region($region): '$string'"</text> <text locale="en">"A message by $unit($sender) from $region($region): '$string'"</text>
</message> </message>
<message name="unitmessage" section="mail"> <message name="unitmessage" section="mail">
@ -635,7 +635,7 @@
<arg name="string" type="string"/> <arg name="string" type="string"/>
<arg name="sender" type="unit"/> <arg name="sender" type="unit"/>
</type> </type>
<text locale="de">"In $region($region) erhielt $unit($unit) eine Botschaft von $unit($sender): '$string'"</text> <text locale="de">"In $region($region) erhielt $unit($unit) eine Botschaft von $unit.dative($sender): '$string'"</text>
<text locale="en">"In $region($region), $unit($unit) received a message by $unit($sender): '$string'"</text> <text locale="en">"In $region($region), $unit($unit) received a message by $unit($sender): '$string'"</text>
</message> </message>
<message name="maintenance_nowork" section="events"> <message name="maintenance_nowork" section="events">
@ -1498,7 +1498,7 @@
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="spell" type="spell"/> <arg name="spell" type="spell"/>
</type> </type>
<text locale="de">"Eine Botschaft von $unit($unit) in $region($region): 'Ups! Quack, Quack!'"</text> <text locale="de">"Eine Botschaft von $unit.dative($unit) in $region($region): 'Ups! Quack, Quack!'"</text>
<text locale="en">"A message from $unit($unit) in $region($region): 'Oops! Croak, Croak!'"</text> <text locale="en">"A message from $unit($unit) in $region($region): 'Oops! Croak, Croak!'"</text>
</message> </message>
<message name="familiar_farcast" section="magic"> <message name="familiar_farcast" section="magic">
@ -1561,7 +1561,7 @@
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="command" type="order"/> <arg name="command" type="order"/>
</type> </type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Der Zauber von $unit($unit) war viel zu schwach und löst sich gleich wieder auf."</text> <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Der Zauber von $unit.dative($unit) war viel zu schwach und löst sich gleich wieder auf."</text>
</message> </message>
<message name="objmagic_effect" section="magic"> <message name="objmagic_effect" section="magic">
<type> <type>
@ -1596,7 +1596,7 @@
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
</type> </type>
<text locale="de">"$unit($mage) erhöht die Körperkraft von $unit($target) beträchtlich."</text> <text locale="de">"$unit($mage) erhöht die Körperkraft von $unit.dative($target) beträchtlich."</text>
<text locale="en">"$unit($mage) increases the strength of $unit($target) dramatically."</text> <text locale="en">"$unit($mage) increases the strength of $unit($target) dramatically."</text>
</message> </message>
<message name="regenaura" section="magic"> <message name="regenaura" section="magic">
@ -2050,7 +2050,7 @@
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="guard" type="unit"/> <arg name="guard" type="unit"/>
</type> </type>
<text locale="de">"$unit($unit) wurde in $region($region) von $unit($guard) aufgehalten."</text> <text locale="de">"$unit($unit) wurde in $region($region) von $unit.dative($guard) aufgehalten."</text>
<text locale="fr">"$unit($unit) was kept in $region($region) by $unit($guard)."</text> <text locale="fr">"$unit($unit) was kept in $region($region) by $unit($guard)."</text>
<text locale="en">"$unit($unit) was kept in $region($region) by $unit($guard)."</text> <text locale="en">"$unit($unit) was kept in $region($region) by $unit($guard)."</text>
</message> </message>
@ -2183,7 +2183,7 @@
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>
<arg name="region" type="region"/> <arg name="region" type="region"/>
</type> </type>
<text locale="de">"Die Partei bekommt von $unit($unit) in $region($region) einen Spitznamen."</text> <text locale="de">"Die Partei bekommt von $unit.dative($unit) in $region($region) einen Spitznamen."</text>
<text locale="en">"Your faction received a nickname from $unit($unit)."</text> <text locale="en">"Your faction received a nickname from $unit($unit)."</text>
</message> </message>
<message name="renamed_building_notseen" section="events"> <message name="renamed_building_notseen" section="events">
@ -2200,7 +2200,7 @@
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="renamer" type="unit"/> <arg name="renamer" type="unit"/>
</type> </type>
<text locale="de">"$building($building) in $region($region) bekommt von $unit($renamer) einen Spitznamen."</text> <text locale="de">"$building($building) in $region($region) bekommt von $unit.dative($renamer) einen Spitznamen."</text>
<text locale="en">"$building($building) in $region($region) received a nickname from $unit($renamer)."</text> <text locale="en">"$building($building) in $region($region) received a nickname from $unit($renamer)."</text>
</message> </message>
<message name="renamed_ship_notseen" section="events"> <message name="renamed_ship_notseen" section="events">
@ -2217,7 +2217,7 @@
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="renamer" type="unit"/> <arg name="renamer" type="unit"/>
</type> </type>
<text locale="de">"Die $ship($ship) in $region($region) bekommt von $unit($renamer) einen Spitznamen."</text> <text locale="de">"Die $ship($ship) in $region($region) bekommt von $unit.dative($renamer) einen Spitznamen."</text>
<text locale="en">"$ship($ship) in $region($region) received a nickname from $unit($renamer)."</text> <text locale="en">"$ship($ship) in $region($region) received a nickname from $unit($renamer)."</text>
</message> </message>
<message name="renamed_notseen" section="events"> <message name="renamed_notseen" section="events">
@ -2234,7 +2234,7 @@
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="renamer" type="unit"/> <arg name="renamer" type="unit"/>
</type> </type>
<text locale="de">"$unit($renamed) in $region($region) bekommt von $unit($renamer) einen Spitznamen."</text> <text locale="de">"$unit($renamed) in $region($region) bekommt von $unit.dative($renamer) einen Spitznamen."</text>
<text locale="en">"$unit($renamed) in $region($region) received a nickname from $unit($renamer)."</text> <text locale="en">"$unit($renamed) in $region($region) received a nickname from $unit($renamer)."</text>
</message> </message>
<message name="phunger" section="events"> <message name="phunger" section="events">
@ -2368,7 +2368,7 @@
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
</type> </type>
<text locale="de">"$unit($mage) legt einen Schleier um die Ausrüstung von $unit($target)."</text> <text locale="de">"$unit($mage) legt einen Schleier um die Ausrüstung von $unit.dative($target)."</text>
<text locale="en">"$unit($mage) shrouds the equipment of $unit($target) in shadows."</text> <text locale="en">"$unit($mage) shrouds the equipment of $unit($target) in shadows."</text>
</message> </message>
<message name="piratesawvictim" section="events"> <message name="piratesawvictim" section="events">
@ -2549,7 +2549,7 @@
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>
</type> </type>
<text locale="de">"$unit($unit) wurde von $unit($target) beim versuchten Diebstahl ertappt."</text> <text locale="de">"$unit($unit) wurde von $unit.dative($target) beim versuchten Diebstahl ertappt."</text>
<text locale="fr">"$unit($unit) was caught by $unit($target) in attempted theft."</text> <text locale="fr">"$unit($unit) was caught by $unit($target) in attempted theft."</text>
<text locale="en">"$unit($unit) was caught by $unit($target) in attempted theft."</text> <text locale="en">"$unit($unit) was caught by $unit($target) in attempted theft."</text>
</message> </message>
@ -6291,7 +6291,7 @@
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>
<arg name="region" type="region"/> <arg name="region" type="region"/>
</type> </type>
<text locale="de">"Antimagie von $unit($self) blockiert in $region($region) einen Zauber von $unit($mage)."</text> <text locale="de">"Antimagie von $unit.dative($self) blockiert in $region($region) einen Zauber von $unit.dative($mage)."</text>
<text locale="en">"In $region($region), anti-magic from $unit($self) blocks the spell of $unit($mage)."</text> <text locale="en">"In $region($region), anti-magic from $unit($self) blocks the spell of $unit($mage)."</text>
</message> </message>
@ -6301,7 +6301,7 @@
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>
<arg name="region" type="region"/> <arg name="region" type="region"/>
</type> </type>
<text locale="de">"$unit($self) schwächt in $region($region) einen Zauber von $unit($mage) durch Antimagie ab."</text> <text locale="de">"$unit($self) schwächt in $region($region) einen Zauber von $unit.dative($mage) durch Antimagie ab."</text>
<text locale="en">"In $region($region), anti-magic from $unit($self) reduces the effect of $unit($mage)'s spell."</text> <text locale="en">"In $region($region), anti-magic from $unit($self) reduces the effect of $unit($mage)'s spell."</text>
</message> </message>