[Stratagus-CVS] stratagus/src/video sdl.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/12/01 00:42:50

Modified files:
        src/video      : sdl.c 

Log message:
        Added SDL_MUSTLOCK

Patches:
Index: stratagus/src/video/sdl.c
diff -u stratagus/src/video/sdl.c:1.106 stratagus/src/video/sdl.c:1.107
--- stratagus/src/video/sdl.c:1.106     Thu Nov 20 02:59:45 2003
+++ stratagus/src/video/sdl.c   Mon Dec  1 00:42:50 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: sdl.c,v 1.106 2003/11/20 07:59:45 nehalmistry Exp $
+//     $Id: sdl.c,v 1.107 2003/12/01 05:42:50 jsalmon3 Exp $
 
 //@{
 
@@ -948,7 +948,9 @@
 global void SdlLockScreen(void)
 {
 #ifndef USE_OPENGL
-    SDL_LockSurface(TheScreen);
+    if (SDL_MUSTLOCK(TheScreen)) {
+       SDL_LockSurface(TheScreen);
+    }
 #ifndef USE_SDL_SURFACE
     VideoMemory = TheScreen->pixels;
 #endif
@@ -961,7 +963,9 @@
 global void SdlUnlockScreen(void)
 {
 #ifndef USE_OPENGL
-    SDL_UnlockSurface(TheScreen);
+    if (SDL_MUSTLOCK(TheScreen)) {
+       SDL_UnlockSurface(TheScreen);
+    }
 #ifndef USE_SDL_SURFACE
 #ifdef DEBUG
     VideoMemory = NULL;                        // Catch errors!