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

last of the duplicate names. battles have lost their separators, though.

Browse source
This commit is contained in:
Enno Rehling 2018-05-17 22:15:24 +02:00
parent 7a10a58605
commit c0ed53b679
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
res/core/messages.xml
View file

@ -1650,7 +1650,7 @@
<text locale="de">"$string"</text> <text locale="de">"$string"</text>
<text locale="en">"$string"</text> <text locale="en">"$string"</text>
</message> </message>
<message name="battle_army" section="battle"> <message name="battle_army_index" section="battle">
<type> <type>
<arg name="index" type="int"/> <arg name="index" type="int"/>
<arg name="name" type="string"/> <arg name="name" type="string"/>
@ -7186,13 +7186,6 @@
<text locale="en">"Units after the battle:"</text> <text locale="en">"Units after the battle:"</text>
</message> </message>
<message name="section_battle" section="battle">
<type>
</type>
<text locale="de">""</text>
<text locale="en">""</text>
</message>
<message name="sp_wolfhowl_effect" section="battle"> <message name="sp_wolfhowl_effect" section="battle">
<type> <type>
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>

12
src/battle.c
View file

@ -110,8 +110,6 @@ typedef enum combatmagic {
static int missile_range[2] = { FIGHT_ROW, BEHIND_ROW }; static int missile_range[2] = { FIGHT_ROW, BEHIND_ROW };
static int melee_range[2] = { FIGHT_ROW, FIGHT_ROW }; static int melee_range[2] = { FIGHT_ROW, FIGHT_ROW };
static message *msg_separator;
const troop no_troop = { 0, 0 }; const troop no_troop = { 0, 0 };
#define FORMULA_ORIG 0 #define FORMULA_ORIG 0
@ -2888,9 +2886,7 @@ static void print_stats(battle * b)
message *msg; message *msg;
char buf[1024]; char buf[1024];
battle_message_faction(b, f, msg_separator); msg = msg_message("battle_army_index", "index name", army_index(s), sname);
msg = msg_message("battle_army", "index name", army_index(s), sname);
battle_message_faction(b, f, msg); battle_message_faction(b, f, msg);
msg_release(msg); msg_release(msg);
@ -2959,8 +2955,6 @@ static void print_stats(battle * b)
print_fighters(b, s); print_fighters(b, s);
} }
message_all(b, msg_separator);
/* Besten Taktiker ermitteln */ /* Besten Taktiker ermitteln */
b->max_tactics = 0; b->max_tactics = 0;
@ -3501,7 +3495,6 @@ static int battle_report(battle * b)
bool komma = false; bool komma = false;
sbs_init(&sbs, buf, sizeof(buf)); sbs_init(&sbs, buf, sizeof(buf));
battle_message_faction(b, fac, msg_separator);
if (cont) if (cont)
m = msg_message("lineup_battle", "turn", b->turn); m = msg_message("lineup_battle", "turn", b->turn);
@ -4008,9 +4001,6 @@ void do_battle(region * r)
battle *b = NULL; battle *b = NULL;
bool fighting = false; bool fighting = false;
ship *sh; ship *sh;
if (msg_separator == NULL) {
msg_separator = msg_message("section_battle", "");
}
fighting = start_battle(r, &b); fighting = start_battle(r, &b);