Changeset 26 for trunk/Classes/multiplayer_create.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/multiplayer_create.cpp (modified) (11 diffs)

trunk/Classes/multiplayer_create.cpp

@@ -81 +81 @@
     shroud_game_(disp.video(), _("Shroud"), gui::button::TYPE_CHECK),
     observers_game_(disp.video(), _("Observers"), gui::button::TYPE_CHECK),
-    cancel_game_(disp.video(), _("Cancel")),
-    launch_game_(disp.video(), _("OK")),
+    cancel_game_(disp.video(), _("Cancel"), gui::button::TYPE_PRESS, "button"),
+    launch_game_(disp.video(), _("OK"), gui::button::TYPE_PRESS, "button"),
     regenerate_map_(disp.video(), _("Regenerate")),
     generator_settings_(disp.video(), _("Settings...")),
@@ -201 +201 @@
 
     // The possible eras to play
+
     const config::child_list& era_list = cfg.get_children("era");
     std::vector<shared_string> eras;
@@ -218 +219 @@
     }
 
+    era_combo_.hide();
 
     utils::string_map i18n_symbols;
@@ -513 +515 @@
             const surface mini(image::getMinimap(minimap_rect_.w,minimap_rect_.h,*map,0));
             SDL_Color back_color = {0,0,0,255};
-            draw_centered_on_background(mini, minimap_rect_, back_color, video().getSurface());
+            draw_centered_on_background(mini, minimap_rect_, back_color/*, video().getSurface()*/);
         }
 #endif
@@ -641 +643 @@
 
         try {
+//          gamemap map(game_config(), map_data);
+
+#ifndef USE_TINY_GUI
             gamemap map(game_config(), map_data);
-
-#ifndef USE_TINY_GUI
+            
             const surface mini(image::getMinimap(minimap_rect_.w,minimap_rect_.h,map,0));
             SDL_Color back_color = {0,0,0,255};
-            draw_centered_on_background(mini, minimap_rect_, back_color, video().getSurface());
+            draw_centered_on_background(mini, minimap_rect_, back_color/*, video().getSurface()*/);
 #endif
         } catch(incorrect_map_format_exception& e) {
@@ -840 +844 @@
 
     maps_menu_.set_max_width(235);
-    maps_menu_.set_max_height(110);
+    maps_menu_.set_max_height(170); //110
 
     maps_menu_.set_location(xpos, ypos);
@@ -848 +852 @@
     maps_menu_.move_selection(mapsel_save);
 
-    ypos += 110 + border_size;
+    ypos += 170 + border_size;
 
     era_label_.set_location(xpos, ypos);
@@ -854 +858 @@
     ypos += era_combo_.height() + border_size;
 
+    use_map_settings_.set_location(xpos, ypos);
+    ypos += use_map_settings_.height() + border_size;
+    
     regenerate_map_.set_location(xpos, ypos);
     regenerate_map_.hide(true);
@@ -859 +866 @@
     generator_settings_.set_location(xpos, ypos);
     ypos += generator_settings_.height() + border_size;
-
-    use_map_settings_.set_location(xpos, ypos);
-    ypos += use_map_settings_.height() + border_size;
-    random_start_time_.set_location(xpos, ypos);
-    ypos += random_start_time_.height() + border_size;
+    
 
 #ifdef MP_VISION_OPTIONAL
@@ -877 +880 @@
 
 #ifdef __IPHONEOS__
-    xpos += 240;
+    #ifdef __IPAD__
+        xpos += 93 + column_border_size;
+    #else
+        xpos += 240;
+    #endif
 #else   
     xpos += 93 + column_border_size;
@@ -913 +920 @@
     countdown_reservoir_time_slider_.set_location(xpos, ypos);
     ypos += countdown_reservoir_time_slider_.height() + border_size;
+    
+    random_start_time_.set_location(xpos, ypos);
+    ypos += random_start_time_.height() + border_size;
+
 
     ypos = ypos_columntop;
 #ifdef __IPHONEOS__
-    xpos += 120;
+    #ifdef __IPAD__
+        xpos += 75;
+    #else
+        xpos += 120;
+    #endif
 #else
     xpos += 75;