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

display reloaded games in yellow instead of green in the game list...

Browse source 
...as they are also a kind of already running games and to make it
more visible that they are games with predefined and usually also
occupied slots
This commit is contained in:
uso 2008-01-29 17:30:00 +00:00
parent d7253c84fb
commit c1506b8a93
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -6,11 +6,12 @@ Version 1.3.15+svn:
lobby which is wrong in most cases (fixes bug #10882), the display
of 'Reloaded game' is disabled for now because of the string freeze
* Fixed MP saves loadind to choose correct human side (bug #10894)
* display reloaded games in yellow instead of green in the game list
as they are also a kind of already running games
* miscellaneous and bug fixes:
* Moved destruction of conditional object before the mutex. This should
fix random crash in network disconnect.
Version 1.3.15:
* language and i18n:
* updated translations: Catalan, Chinese, Czech, Danish, Dutch, French,

3
players_changelog
View file

@ -5,6 +5,9 @@ changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
Version 1.3.15+svn:
* Language and translations
* Updated translations: Filipino, German.
* Multiplayer
* Reloaded games are displayed in yellow (instead of green) in the game
list as they are also a kind of already running games.
Version 1.3.15:
* Language and translations

9
src/multiplayer_lobby.cpp
View file

@ -126,10 +126,10 @@ void gamebrowser::draw_row(const size_t index, const SDL_Rect& item_rect, ROW_TY
// Set font color
SDL_Color font_color;
if (game.vacant_slots > 0) {
if (!game.started) {
font_color = font::GOOD_COLOUR;
} else {
if (game.reloaded || game.started) {
font_color = font::YELLOW_COLOUR;
} else {
font_color = font::GOOD_COLOUR;
}
} else {
if (game.observers) {
@ -450,7 +450,8 @@ void gamebrowser::set_game_items(const config& cfg, const config& game_config)
}
if(level_cfg) {
games_.back().map_info += level_cfg->get_attribute("name");
if (utils::string_bool((**game)["savegame"], false)) {
games_.back().reloaded = (**game)["savegame"] == "yes";
if (games_.back().reloaded) {
//! @todo: display of 'Reloaded game' in the MP lobby is
// deactivated for now because we have a string freeze and
// there is no good string to re-use

1
src/multiplayer_lobby.hpp
View file

@ -46,6 +46,7 @@ public:
std::string time_limit;
size_t vacant_slots;
unsigned int current_turn;
bool reloaded;
bool started;
bool fog;
bool shroud;