[Wesnoth-cvs-commits] wesnoth/src multiplayer_create.cpp

[Jordà Polo]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jordà Polo <address@hidden>     05/05/05 22:59:14

Modified files:
        src            : multiplayer_create.cpp 

Log message:
        moved "Era" to the right column and "Regenerate" to the left (below the
        minimap) in the multiplayer game creation dialog

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.22 
wesnoth/src/multiplayer_create.cpp:1.23
--- wesnoth/src/multiplayer_create.cpp:1.22     Thu Apr 21 20:52:46 2005
+++ wesnoth/src/multiplayer_create.cpp  Thu May  5 22:59:13 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.22 2005/04/21 20:52:46 gruikya Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.23 2005/05/05 22:59:13 ettin Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -394,15 +394,18 @@
        // Save ypos here (column top)
        int ypos_columntop = ypos;
 
-       // First column: minimap & era choice
+       // First column: minimap & random map options
        const int minimap_width = 200;
        SDL_Rect mmrect = { xpos, ypos, minimap_width, minimap_width };
        minimap_rect_ = mmrect;
        ypos += minimap_width + border_size;
+
        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 + era_label_.width() + border_size, ypos);
+
+       regenerate_map_.set_location(xpos, ypos);
+       ypos += regenerate_map_.height() + border_size;
+       generator_settings_.set_location(xpos, ypos);
 
        // Second column: map menu
        ypos = ypos_columntop + border_size;
@@ -439,6 +442,10 @@
        xp_modifier_slider_.set_location(xpos, ypos);
        ypos += xp_modifier_slider_.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;
+
        fog_game_.set_location(xpos, ypos);
        ypos += fog_game_.height() + border_size;
 
@@ -451,10 +458,6 @@
        vision_combo_.set_location(xpos, ypos);
        ypos += vision_combo_.height() + border_size;
 
-       regenerate_map_.set_location(xpos, ypos);
-       ypos += regenerate_map_.height() + border_size;
-       generator_settings_.set_location(xpos, ypos);
-
        // OK / Cancel buttons
        gui::button* left_button = &launch_game_;
        gui::button* right_button = &cancel_game_;