[Stratagus-CVS] stratagus/src editor/editloop.c map/map_draw.c ...

[Nehal Mistry]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Nehal Mistry <address@hidden>   03/11/18 01:58:03

Modified files:
        src/editor     : editloop.c 
        src/map        : map_draw.c map_fog.c 

Log message:
        editor partially works

Patches:
Index: stratagus/src/editor/editloop.c
diff -u stratagus/src/editor/editloop.c:1.143 
stratagus/src/editor/editloop.c:1.144
--- stratagus/src/editor/editloop.c:1.143       Mon Nov 17 14:14:30 2003
+++ stratagus/src/editor/editloop.c     Tue Nov 18 01:58:02 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: editloop.c,v 1.143 2003/11/17 19:14:30 nehalmistry Exp $
+//     $Id: editloop.c,v 1.144 2003/11/18 06:58:02 nehalmistry Exp $
 
 //@{
 
@@ -912,7 +912,9 @@
 {
     int i;
 
+#ifndef USE_SDL_SURFACE
     VideoLockScreen();                 // { prepare video write
+#endif
 
     HideAnyCursor();                   // remove cursor (when available)
 
@@ -1003,7 +1005,9 @@
 
     DrawAnyCursor();
 
+#ifdef USE_SDL_SURFACE
     VideoUnlockScreen();               // } end write access
+#endif
 
     // FIXME: For now update everything each frame
 
Index: stratagus/src/map/map_draw.c
diff -u stratagus/src/map/map_draw.c:1.54 stratagus/src/map/map_draw.c:1.55
--- stratagus/src/map/map_draw.c:1.54   Mon Nov 17 14:14:35 2003
+++ stratagus/src/map/map_draw.c        Tue Nov 18 01:58:03 2003
@@ -29,7 +29,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: map_draw.c,v 1.54 2003/11/17 19:14:35 nehalmistry Exp $
+//     $Id: map_draw.c,v 1.55 2003/11/18 06:58:03 nehalmistry Exp $
 
 //@{
 
@@ -303,14 +303,14 @@
 
     srect.x = TileSizeX * (tile % tilepitch);
     srect.y = TileSizeY * (tile / tilepitch);
+    srect.w = TileSizeX;
+    srect.h = TileSizeY;
 
     drect.x = x;
     drect.y = y;
 
-    SDL_LockSurface(TheScreen);
     SDL_BlitSurface(TheMap.TileGraphic->Surface, &srect, 
        TheScreen, &drect);
-    SDL_UnlockSurface(TheScreen);
 }
 #else
 /**
Index: stratagus/src/map/map_fog.c
diff -u stratagus/src/map/map_fog.c:1.114 stratagus/src/map/map_fog.c:1.115
--- stratagus/src/map/map_fog.c:1.114   Mon Nov 17 14:14:36 2003
+++ stratagus/src/map/map_fog.c Tue Nov 18 01:58:03 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: map_fog.c,v 1.114 2003/11/17 19:14:36 nehalmistry Exp $
+//     $Id: map_fog.c,v 1.115 2003/11/18 06:58:03 nehalmistry Exp $
 
 //@{
 
@@ -511,13 +511,13 @@
 
     srect.x = TileSizeX * (tile % tilepitch);
     srect.y = TileSizeY * (tile / tilepitch);
+    srect.w = TileSizeX;
+    srect.h = TileSizeY;
 
     drect.x = x;
     drect.y = y;
 
-    SDL_LockSurface(TheScreen);
     SDL_BlitSurface(TheMap.TileGraphic->Surface, &srect, TheScreen, &drect);
-    SDL_UnlockSurface(TheScreen);
 }
 
 global void VideoDrawUnexploredSolid(const int tile, int x, int y)
@@ -1542,13 +1542,13 @@
 
     srect.x = TileSizeX * (tile % tilepitch);
     srect.y = TileSizeY * (tile / tilepitch);
+    srect.w = TileSizeX;
+    srect.y = TileSizeY;
 
     drect.x = x;
     drect.y = y;
 
-    SDL_LockSurface(TheScreen);
     SDL_BlitSurface(TheMap.TileGraphic->Surface, &srect, TheScreen, &drect);
-    SDL_UnlockSurface(TheScreen);
 }
 
 #else