[Pingus-CVS] CVS: Games/Pingus/src client.cxx,1.43,1.44 level_result.cxx,1.11,1.12 loading.cxx,1.3,1.4 pingu.cxx,1.40,1.41 pingus_main.cxx,1.82,1.83 theme_selector.cxx,1.10,1.11

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv5042

Modified Files:
        client.cxx level_result.cxx loading.cxx pingu.cxx 
        pingus_main.cxx theme_selector.cxx 
Log Message:
- removed obsolete mouse show/hide stuff
- fixed software cursor a bit
- made the current controller globally reachable

Index: client.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/client.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- client.cxx  25 Mar 2003 00:37:44 -0000      1.43
+++ client.cxx  15 Apr 2003 19:06:50 -0000      1.44
@@ -56,9 +56,6 @@
   
   Timer timer("Client UI generation");
 
-  Display::set_cursor(CL_MouseCursorProvider::load("Cursors/cursor", 
-                                                  
PingusResource::get("game")));
-
   // These object will get deleted by the gui_manager
   button_panel = new ButtonPanel(this, 2, CL_Display::get_height()/2);
   playfield    = new Playfield(this);
@@ -349,11 +346,6 @@
 void
 Client::on_startup ()
 {
-  /** Hide the system cursor and show the software one */
-  Display::show_cursor();
-  // FIXME: using this twice will crash with an X Error
-  //CL_MouseCursor::hide ();
-
   do_replay = false;
   is_finished = false;
   skip_frame = 0;
@@ -378,7 +370,6 @@
 void
 Client::on_shutdown ()
 {
-  Display::hide_cursor();
 }
 
 /* EOF */

Index: level_result.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/level_result.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- level_result.cxx    8 Apr 2003 19:56:40 -0000       1.11
+++ level_result.cxx    15 Apr 2003 19:06:50 -0000      1.12
@@ -48,8 +48,6 @@
 
   PingusSound::play_music("pingus-2.it");
 
-  Display::hide_cursor();
-
   for(int y = 0; y < CL_Display::get_height(); y += background.get_height())
     for(int x = 0; x < CL_Display::get_width(); x += background.get_width())
       background.put_screen(x, y);

Index: loading.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/loading.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- loading.cxx 19 Feb 2003 09:50:36 -0000      1.3
+++ loading.cxx 15 Apr 2003 19:06:50 -0000      1.4
@@ -45,13 +45,8 @@
 void
 Loading::draw()
 {
-  bool cursor_shown = Display::cursor_shown();
-
   if (!is_init)
     init();
-  
-  if (cursor_shown)
-    Display::hide_cursor();
 
   CL_Display::clear_display();
 
@@ -59,22 +54,14 @@
                 (CL_Display::get_height() - sur.get_height())/2);
 
   Display::flip_display();
-
-  if (cursor_shown)
-    Display::show_cursor();
 }
 
 void
 Loading::draw_progress(const std::string& str, float progress)
 {
-  bool cursor_shown = Display::cursor_shown();
-
   if (!is_init)
     init();
 
-  if (cursor_shown)
-    Display::hide_cursor();
-
   CL_Display::clear_display();
 
   sur.put_screen((CL_Display::get_width() - sur.get_width())/2,
@@ -93,9 +80,6 @@
                        1.0, 0.0, 0.0, 1.0);
 
   Display::flip_display();
-
-  if (cursor_shown)
-    Display::show_cursor();
 }
 
 /* EOF */

Index: pingu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- pingu.cxx   21 Mar 2003 22:08:06 -0000      1.40
+++ pingu.cxx   15 Apr 2003 19:06:50 -0000      1.41
@@ -119,7 +119,7 @@
 
   if (status == PS_DEAD)
     {
-      pout(PINGUS_DEBUG_ACTIONS) << _("Setting action to a dead pingu") << 
std::endl;
+      pout(PINGUS_DEBUG_ACTIONS) << "Setting action to a dead pingu" << 
std::endl;
       ret_val =  false;
     }
   else

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- pingus_main.cxx     15 Apr 2003 10:33:15 -0000      1.82
+++ pingus_main.cxx     15 Apr 2003 19:06:50 -0000      1.83
@@ -390,11 +390,11 @@
       break;
    
     case 145:
-      swcursor_enabled = true;
+      swcursor_enabled = false;
       break;
 
     case 146:
-      swcursor_enabled = false;
+      swcursor_enabled = true;
       break;
 
     case 147:
@@ -510,7 +510,7 @@
         << "\n   -e, --editor             " << _("Launch the Level editor 
(experimental)")
         << "\n   --disable-auto-scrolling " << _("Disable automatic scrolling")
         //          "   --disable-swcursor       Disable software cursor, use 
hw cursor instead\n"
-        //          "   --enable-swcursor        Enable software cursor\n"
+        << "\n   --enable-swcursor        " << _("Enable software cursor")
         //"   --disable-action-help    Disable action button help strings\n"
         //"   --enable-action-help     Enable action button help 
strings(default)\n"
         << "\n   --no-cfg-file            " << _("Don't read ~/.pingus/config")

Index: theme_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/theme_selector.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- theme_selector.cxx  19 Feb 2003 11:33:00 -0000      1.10
+++ theme_selector.cxx  15 Apr 2003 19:06:50 -0000      1.11
@@ -266,10 +266,6 @@
 
   PingusSound::play_music("pingus-1.it");
 
-  Display::set_cursor(CL_MouseCursorProvider::load("Cursors/cursor", 
-                                                  
PingusResource::get("game")));
-  Display::show_cursor(true);
-
   finished = false;
   while(!finished)
     {
@@ -281,7 +277,6 @@
   while (CL_Keyboard::get_keycode(CL_KEY_ESCAPE))
     CL_System::keep_alive ();
 
-  Display::hide_cursor();
   event->enabled = false;
 }