[Wesnoth-cvs-commits] wesnoth/src multiplayer_create.cpp multiplayer_... (August 01, 2005 - 09:43)

 

CVSROOT:	/cvsroot/wesnoth
Module name:	wesnoth
Branch: 	
Changes by:	Jon Daniel <j_daniel@xxxxxxxxxxxxxxxx>	05/08/01 07:34:38

Modified files:
	src            : multiplayer_create.cpp multiplayer_create.hpp 

Log message:
	Oops forgot about the random map buttons now it is 800x600 safe.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.31 wesnoth/src/multiplayer_create.cpp:1.32
--- wesnoth/src/multiplayer_create.cpp:1.31	Mon Aug  1 07:12:49 2005
+++ wesnoth/src/multiplayer_create.cpp	Mon Aug  1 07:34:38 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.31 2005/08/01 07:12:49 j_daniel Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.32 2005/08/01 07:34:38 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -46,7 +46,6 @@
 	name_entry_label_(disp.video(), _("Name of game:"), font::SIZE_SMALL, font::LOBBY_COLOUR),
 	num_players_label_(disp.video(), "", font::SIZE_SMALL, font::LOBBY_COLOUR),
 	era_label_(disp.video(), _("Era:"), font::SIZE_SMALL, font::LOBBY_COLOUR),
-	vision_label_(disp.video(), _("Vision:"), font::SIZE_SMALL, font::LOBBY_COLOUR),
 	map_label_(disp.video(), _("Map to play:"), font::SIZE_SMALL, font::LOBBY_COLOUR),
 	use_map_settings_(disp.video(), _("Use map settings"), gui::button::TYPE_CHECK),
 	fog_game_(disp.video(), _("Fog Of War"), gui::button::TYPE_CHECK),
@@ -357,7 +356,6 @@
 	name_entry_label_.hide(hide);
 	num_players_label_.hide(hide);
 	era_label_.hide(hide);
-	vision_label_.hide(hide);
 	map_label_.hide(hide);
 
 	use_map_settings_.hide(hide);
@@ -420,18 +418,15 @@
 
 	num_players_label_.set_location(xpos, ypos);
 	ypos += num_players_label_.height() + border_size;
-	
-	era_label_.set_location(xpos, ypos + (era_combo_.height() - era_label_.height()) / 2);
-	era_combo_.set_location(xpos + vision_label_.width() + border_size, ypos);
-	ypos += era_combo_.height() + border_size;
-
-	vision_label_.set_location(xpos, ypos + (vision_combo_.height() - vision_label_.height()) / 2);
-	vision_combo_.set_location(xpos + vision_label_.width() + border_size, ypos);
-	ypos += vision_combo_.height() + border_size;
 
-	regenerate_map_.set_location(xpos, ypos);
+	regenerate_map_.set_location(xpos + era_label_.width() + border_size, ypos);
 	ypos += regenerate_map_.height() + border_size;
-	generator_settings_.set_location(xpos, ypos);
+	generator_settings_.set_location(xpos + era_label_.width() + border_size, ypos);
+	ypos += generator_settings_.height() + border_size;
+
+	era_label_.set_location(xpos, ypos + (era_combo_.height() - era_label_.height()) / 2);
+	era_combo_.set_location(xpos + era_label_.width() + border_size, ypos);
+	ypos += era_combo_.height() + border_size;
 
 	// Second column: map menu
 	ypos = ypos_columntop;
@@ -480,6 +475,9 @@
 
 	observers_game_.set_location(xpos, ypos);
 	ypos += observers_game_.height() + border_size;
+
+	vision_combo_.set_location(xpos, ypos);
+	ypos += vision_combo_.height() + border_size;
 
 	// OK / Cancel buttons
 	gui::button* left_button = &launch_game_;
Index: wesnoth/src/multiplayer_create.hpp
diff -u wesnoth/src/multiplayer_create.hpp:1.6 wesnoth/src/multiplayer_create.hpp:1.7
--- wesnoth/src/multiplayer_create.hpp:1.6	Mon Aug  1 07:12:49 2005
+++ wesnoth/src/multiplayer_create.hpp	Mon Aug  1 07:34:38 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.hpp,v 1.6 2005/08/01 07:12:49 j_daniel Exp $ */
+/* $Id: multiplayer_create.hpp,v 1.7 2005/08/01 07:34:38 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -92,7 +92,6 @@
 	gui::label name_entry_label_;
 	gui::label num_players_label_;
 	gui::label era_label_;
-	gui::label vision_label_;
 	gui::label map_label_;
 
 	gui::button use_map_settings_;



You are on the gna.org mail server.

Generated by mhonarc, Tue Sep 20 16:52:51 2005