[Pingus-CVS] r2603 - in trunk: . src/editor src/gui

[jave27]

Author: jave27
Date: 2006-01-18 19:12:58 +0100 (Wed, 18 Jan 2006)
New Revision: 2603

Modified:
   trunk/Pingus.vcproj
   trunk/src/editor/panel_buttons.cxx
   trunk/src/gui/display.cxx
   trunk/src/gui/screen_manager.cxx
Log:
Sped up screen changes a bit.  The animation still doesn't work all that well.
Updated combobox label and VC Project file.

Modified: trunk/Pingus.vcproj
===================================================================
--- trunk/Pingus.vcproj 2006-01-18 15:01:29 UTC (rev 2602)
+++ trunk/Pingus.vcproj 2006-01-18 18:12:58 UTC (rev 2603)
@@ -290,6 +290,9 @@
                                        RelativePath=".\src\gui\combobox.hxx">
                                </File>
                                <File
+                                       
RelativePath=".\src\gui\combobox_listener.hxx">
+                               </File>
+                               <File
                                        RelativePath=".\src\gui\component.hxx">
                                </File>
                                <File

Modified: trunk/src/editor/panel_buttons.cxx
===================================================================
--- trunk/src/editor/panel_buttons.cxx  2006-01-18 15:01:29 UTC (rev 2602)
+++ trunk/src/editor/panel_buttons.cxx  2006-01-18 18:12:58 UTC (rev 2603)
@@ -154,7 +154,7 @@
        panel->get_combobox(1)->clear();
        panel->get_combobox(1)->set_label("Type");
        panel->get_combobox(2)->set_label("Subtype");
-       panel->get_combobox(3)->set_label("Subtype 2");
+       panel->get_combobox(3)->set_label("Groundpiece");
        std::vector<std::string> groundpieces = 
Resource::get_sections("groundpieces");
        for (unsigned i = 0; i < groundpieces.size(); i++)
        {

Modified: trunk/src/gui/display.cxx
===================================================================
--- trunk/src/gui/display.cxx   2006-01-18 15:01:29 UTC (rev 2602)
+++ trunk/src/gui/display.cxx   2006-01-18 18:12:58 UTC (rev 2603)
@@ -63,7 +63,6 @@
     }
 
   CL_Display::flip();
-  //CL_Display::put_display (CL_Rect (320, 0, 800, 600));
 }
 
 void

Modified: trunk/src/gui/screen_manager.cxx
===================================================================
--- trunk/src/gui/screen_manager.cxx    2006-01-18 15:01:29 UTC (rev 2602)
+++ trunk/src/gui/screen_manager.cxx    2006-01-18 18:12:58 UTC (rev 2603)
@@ -244,23 +244,25 @@
   DeltaManager delta_manager;
   float passed_time = 0;
 
-  Input::EventLst events;
+  //Input::EventLst events;
 
+       int screen_width = CL_Display::get_width ();
+       int screen_height = CL_Display::get_height ();
   float progress = 0.0f;
   while (progress <= 1.0f)
     {
       float time_delta = delta_manager.getset ();
       passed_time += time_delta;
 
-      int border_x = int((CL_Display::get_width ()/2) * (1.0f - progress));
-      int border_y = int((CL_Display::get_height ()/2) * (1.0f - progress));
+      int border_x = int((screen_width/2) * (1.0f - progress));
+      int border_y = int((screen_height/2) * (1.0f - progress));
 
       old_screen->draw(*display_gc);
       CL_Display::get_current_window()->get_gc()
         ->push_cliprect(CL_Rect(0 + border_x,
                                 0 + border_y,
-                                CL_Display::get_width () - border_x,
-                                CL_Display::get_height () - border_y));
+                                screen_width - border_x,
+                                screen_height - border_y));
       new_screen->draw(*display_gc);
 
       //GameDelta delta (time_delta, CL_System::get_time(), events);
@@ -271,7 +273,7 @@
       CL_Display::get_current_window()->get_gc()->pop_cliprect ();
 
       Display::flip_display ();
-      CL_System::keep_alive ();
+      CL_System::keep_alive (5);
 
       progress = passed_time/1.0f;
     }