changeset 851:9406aa7fdd61

Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 21 Oct 2014 20:42:57 +0300
parents 00729394df6a (current diff) 62ee4e590a15 (diff)
children f70d6f9532cd
files
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmsimple.c	Tue Oct 21 20:42:31 2014 +0300
+++ b/src/dmsimple.c	Tue Oct 21 20:42:57 2014 +0300
@@ -476,7 +476,7 @@
 
         // Draw frame
         engine.frameTime = SDL_GetTicks();
-        if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0)
+        if (SDL_MUSTLOCK(engine.screen) && SDL_LockSurface(engine.screen) != 0)
         {
             dmError("Can't lock surface.\n");
             goto out;
@@ -542,7 +542,7 @@
             menuStr);
 
         // Flip screen
-        if (SDL_MUSTLOCK(engine.screen) != 0)
+        if (SDL_MUSTLOCK(engine.screen))
             SDL_UnlockSurface(engine.screen);
 
         SDL_Flip(engine.screen);
@@ -828,7 +828,7 @@
             engine.startTime = engine.frameTime - engine.pauseTime;
         }
 
-        if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0)
+        if (SDL_MUSTLOCK(engine.screen) && SDL_LockSurface(engine.screen) != 0)
         {
             dmError("Can't lock surface.\n");
             goto error_exit;
@@ -849,7 +849,7 @@
 #endif
 
         // Flip screen
-        if (SDL_MUSTLOCK(engine.screen) != 0)
+        if (SDL_MUSTLOCK(engine.screen))
             SDL_UnlockSurface(engine.screen);
 
         SDL_Flip(engine.screen);