0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xxx sighted messages are now blue for friendly units thx to gim

Browse source
This commit is contained in:
Jérémy Rosen 2006-09-09 08:24:34 +00:00
parent 9a649421ad
commit 63122bd250
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -29,6 +29,7 @@ Version 1.3-svn:
'ctrl+alt+r' since shift toggles accelerated mode and produced an
animation glitch with this hotkey; this needs to be considered for
future hotkey changes/additions (see bug #6312)
* when discovering friendly units, the message is now blue
* WML engine
* allow_new_game key (default=yes) to prevent [multiplayer] scenarios to
show up in the multiplayer game creation interface (FR #6397)

8
src/actions.cpp
View file

@ -1987,25 +1987,31 @@ size_t move_unit(display* disp, const game_data& gamedata,
}
const char* msg_id;
SDL_Color msg_colour;
//the message we display is different depending on whether units sighted
//were enemies or friends, and whether there is one or more
if(seen_units.size() == 1) {
if(nfriends == 1) {
msg_id = N_("Friendly unit sighted");
msg_colour = font::GOOD_COLOUR;
} else {
msg_id = N_("Enemy unit sighted!");
msg_colour = font::BAD_COLOUR;
}
}
else if(nfriends == 0 || nenemies == 0) {
if(nfriends > 0) {
msg_id = N_("$friends Friendly units sighted");
msg_colour = font::GOOD_COLOUR;
} else {
msg_id = N_("$enemies Enemy units sighted!");
msg_colour = font::BAD_COLOUR;
}
}
else {
msg_id = N_("Units sighted! ($friends friendly, $enemies enemy)");
msg_colour = font::NORMAL_COLOUR;
}
utils::string_map symbols;
@ -2025,7 +2031,7 @@ size_t move_unit(display* disp, const game_data& gamedata,
}
const std::string message = utils::interpolate_variables_into_string(msg.str(), &symbols);
font::add_floating_label(message,font::SIZE_XLARGE,font::BAD_COLOUR,
font::add_floating_label(message,font::SIZE_XLARGE,msg_colour,
disp->map_area().w/2,disp->map_area().h/3,
0.0,0.0,100,disp->map_area(),font::CENTER_ALIGN);
}