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

Merge pull request #123 from badgerman/master

Browse source 
small problems found in the last preview before the 3.4 release
This commit is contained in:
Enno Rehling 2015-02-01 10:50:03 +01:00
commit 92c6e1382d
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/core/messages.xml
View file

@ -3212,8 +3212,7 @@
<type> <type>
<arg name="dead" type="int"/> <arg name="dead" type="int"/>
</type> </type>
<text locale="de">"$if($eq($dead,1),"Ein Bauer","$int($dead) Bauern") verhungert."</text> <text locale="de">"$if($eq($dead,1),"Ein Bauer verhungert","$int($dead) Bauern verhungern")."</text>
<text locale="fr">"$if($eq($dead,1),"One peasant starves","$int($dead) peasants starve")."</text>
<text locale="en">"$if($eq($dead,1),"One peasant starves","$int($dead) peasants starve")."</text> <text locale="en">"$if($eq($dead,1),"One peasant starves","$int($dead) peasants starve")."</text>
</message> </message>
<message name="volcanooutbreaknn" section="events"> <message name="volcanooutbreaknn" section="events">

3
src/laws.c
View file

@ -330,8 +330,9 @@ static void peasants(region * r)
} }
luck = peasant_luck_effect(peasants, luck, maxp, .5); luck = peasant_luck_effect(peasants, luck, maxp, .5);
#ifdef STORCH_SPAM_BUG_2072
ADDMSG(&r->msgs, msg_message("peasantluck_success", "births", luck)); ADDMSG(&r->msgs, msg_message("peasantluck_success", "births", luck));
#endif
peasants += births + luck; peasants += births + luck;
} }

1
src/report.c
View file

@ -2416,6 +2416,7 @@ const char *charset)
/* Nachrichten an REGION in der Region */ /* Nachrichten an REGION in der Region */
if (sr->mode == see_unit || sr->mode == see_travel) { if (sr->mode == see_unit || sr->mode == see_travel) {
// TODO: Bug 2073
message_list *mlist = r_getmessages(r, f); message_list *mlist = r_getmessages(r, f);
rp_messages(F, r->msgs, f, 0, true); rp_messages(F, r->msgs, f, 0, true);
if (mlist) if (mlist)