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

made selected() return bool tweaked the observe and join conditions

Browse source 
dos2unix
This commit is contained in:
Jon Daniel 2005-09-17 20:16:38 +00:00
parent ff78f2a798
commit c0e343b3ca
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/multiplayer_lobby.cpp
View file

@ -460,8 +460,8 @@ void lobby::process_event()
join_game_.hide(!games_menu_.selection_is_joinable());
observe_game_.hide(!games_menu_.selection_is_observable());
const bool observe = observe_game_.pressed() || (games_menu_.selected() >= 0 && games_menu_.selection_is_observable() && !games_menu_.selection_is_joinable());
const bool join = join_game_.pressed() || (games_menu_.selected() >= 0 && games_menu_.selection_is_joinable());
const bool observe = (observe_game_.pressed() || (games_menu_.selected() && !games_menu_.selection_is_joinable())) && games_menu_.selection_is_observable();
const bool join = (join_game_.pressed() || games_menu_.selected()) && games_menu_.selection_is_joinable();
if(join || observe) {
const config* game = gamelist().child("gamelist");

2
src/multiplayer_lobby.hpp
View file

@ -55,7 +55,7 @@ public:
bool empty() const { return games_.empty(); }
bool selection_is_joinable() const { return empty() ? false : games_[selected_].vacant_slots; }
bool selection_is_observable() const { return empty() ? false : games_[selected_].observers; }
int selected() const { return double_clicked_ && !empty() ? static_cast<int>(selected_) : -1; }
bool selected() const { return double_clicked_ && !empty(); }
int selection() const { return selected_; }
protected:
private: