[Pingus-CVS] r2842 - in branches/pingus_sdl: . data/data src src/gui

[jsalmon3]

Author: jsalmon3
Date: 2007-08-12 01:17:34 +0200 (Sun, 12 Aug 2007)
New Revision: 2842

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/data/data/core.res
   branches/pingus_sdl/src/gui/screen_manager.cpp
   branches/pingus_sdl/src/sprite.cpp
Log:
Fixed swcursor

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-11 22:57:23 UTC (rev 2841)
+++ branches/pingus_sdl/TODO    2007-08-11 23:17:34 UTC (rev 2842)
@@ -40,8 +40,6 @@
 
 - hurry-up should be removed and replaced by something less heavy
 
-- --enabel-swcursor is broken (swcursor data is wrong)
-
 - check all classic levels for issues
 
 - reorder main menu in the 0.6 fashion with no submenus: (editor,

Modified: branches/pingus_sdl/data/data/core.res
===================================================================
--- branches/pingus_sdl/data/data/core.res      2007-08-11 22:57:23 UTC (rev 
2841)
+++ branches/pingus_sdl/data/data/core.res      2007-08-11 23:17:34 UTC (rev 
2842)
@@ -39,6 +39,7 @@
       (sprite
         (name "animcross")
         (image-file "../images/core/cursors/animcross.png")
+        (offset -18 -18)
         (image-array 10 1))
      )
 

Modified: branches/pingus_sdl/src/gui/screen_manager.cpp
===================================================================
--- branches/pingus_sdl/src/gui/screen_manager.cpp      2007-08-11 22:57:23 UTC 
(rev 2841)
+++ branches/pingus_sdl/src/gui/screen_manager.cpp      2007-08-11 23:17:34 UTC 
(rev 2842)
@@ -58,7 +58,7 @@
     {
       cursor = new Cursor("core/cursors/animcross");
       Display::add_flip_screen_hook(cursor);
-      //CL_MouseCursor::hide();
+      SDL_ShowCursor(SDL_DISABLE);
     }
 
   DeltaManager delta_manager;

Modified: branches/pingus_sdl/src/sprite.cpp
===================================================================
--- branches/pingus_sdl/src/sprite.cpp  2007-08-11 22:57:23 UTC (rev 2841)
+++ branches/pingus_sdl/src/sprite.cpp  2007-08-11 23:17:34 UTC (rev 2842)
@@ -75,13 +75,15 @@
 
     frame_pos = desc.frame_pos;
 
+    array = desc.array;
+
     frame_size.width  = (desc.frame_size.width  == -1) ? surface->w : 
desc.frame_size.width;
+    frame_size.width /= array.width;
     frame_size.height = (desc.frame_size.height == -1) ? surface->h : 
desc.frame_size.height;
+    frame_size.height /= array.height;
 
     frame_delay  = desc.speed;
 
-    array = desc.array;
-
     loop = desc.loop;
     loop_last_cycle = false;