[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp
From: |
David White |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp |
Date: |
Fri, 31 Dec 2004 11:16:15 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <address@hidden> 04/12/31 15:45:53
Modified files:
src : multiplayer_lobby.cpp
Log message:
made 'join game' button display at correct times
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
Patches:
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.55
wesnoth/src/multiplayer_lobby.cpp:1.56
--- wesnoth/src/multiplayer_lobby.cpp:1.55 Fri Dec 31 00:46:41 2004
+++ wesnoth/src/multiplayer_lobby.cpp Fri Dec 31 15:45:53 2004
@@ -99,7 +99,7 @@
}
options.push_back(str.str());
- game_vacant_slots.push_back(slots != "" && slots != "0");
+ game_vacant_slots.push_back(turn.empty() && slots != "" &&
slots != "0");
game_observers.push_back((**i.first)["observer"] != "no");
}
@@ -315,7 +315,7 @@
const bool games_available = game_vacant_slots.empty()
== false;
const bool double_click = games_menu.double_clicked();
- const bool observe = observe_game.pressed() ||
!games_available && double_click;
+ const bool observe = observe_game.pressed() ||
games_available && double_click && join_game.hidden();
if(games_available && (observe || join_game.pressed()
|| double_click)) {
const size_t index =
size_t(games_menu.selection());
const config::const_child_itors i =
gamelist->child_range("game");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src multiplayer_lobby.cpp,
David White <=