Author: shadowmaster
Date: Wed Mar 21 21:42:36 2012
New Revision: 53605
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53605&view=rev
Log:
mp: Hide the Set Password option for local hotseat games (fixes bug #10784)
Modified:
trunk/changelog
trunk/src/multiplayer_create.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=53605&r1=53604&r2=53605&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Wed Mar 21 21:42:36 2012
@@ -73,6 +73,8 @@
* Canceling the sides setup screen when hosting a MP game now brings the
host back to the game configuration screen first instead of returning
immediately to the lobby or (for hotseat) titlescreen (bug #7130)
+ * The Set Password action is no longer shown for local hotseat games
+ (bug #10784)
* Music and sound effects:
* Replaced some of the wolf hit sounds with lower-pitched ones
* Terrain:
Modified: trunk/src/multiplayer_create.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_create.cpp?rev=53605&r1=53604&r2=53605&view=diff
==============================================================================
--- trunk/src/multiplayer_create.cpp (original)
+++ trunk/src/multiplayer_create.cpp Wed Mar 21 21:42:36 2012
@@ -735,8 +735,12 @@
ypos += era_label_.height() + border_size;
era_combo_.set_location(xpos, ypos);
ypos += era_combo_.height() + border_size;
- password_button_.set_location(xpos, ypos);
- ypos += password_button_.height() + border_size;
+ if(!local_players_only_) {
+ password_button_.set_location(xpos, ypos);
+ ypos += password_button_.height() + border_size;
+ } else {
+ password_button_.hide(true);
+ }
#ifdef MP_VISION_OPTIONAL
vision_combo_.set_location(xpos, ypos);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
