hedgewars/hwengine.pas
changeset 5730 1ef0027411f4
parent 5724 3064ed85a5bd
child 5732 f3f381011728
--- a/hedgewars/hwengine.pas	Fri Sep 02 00:24:54 2011 -0400
+++ b/hedgewars/hwengine.pas	Fri Sep 02 09:04:11 2011 +0400
@@ -181,10 +181,9 @@
                         end;
                 SDL_VIDEORESIZE: begin
                     // using lower values causes widget overlap and video issues
-                    if event.resize.w > cMinScreenWidth then cScreenWidth:= event.resize.w
-                    else cScreenWidth:= cMinScreenWidth;
-                    if event.resize.h > cMinScreenHeight then cScreenHeight:= event.resize.h
-                    else cScreenHeight:= cMinScreenHeight;
+                    cScreenWidth:= max(event.resize.w, cMinScreenWidth);
+                    cScreenHeight:= max(event.resize.h, cMinScreenHeight);
+
                     ParseCommand('fullscr '+intToStr(LongInt(cFullScreen)), true);
                     WriteLnToConsole('window resize');
                     InitCameraBorders();
@@ -244,12 +243,10 @@
     recordFileName:= gameArgs[10];
     cStereoMode:= smNone;
 {$ENDIF}
-    cMinScreenWidth:= cScreenWidth;
-    cMinScreenHeight:= cScreenHeight;
+    cMinScreenWidth:= min(cScreenWidth, 480);
+    cMinScreenHeight:= min(cScreenHeight, 320);
     cOrigScreenWidth:= cScreenWidth;
     cOrigScreenHeight:= cScreenHeight;
-    if 480 < cMinScreenWidth then cMinScreenWidth:= 480;
-    if 320 < cMinScreenHeight then cMinScreenHeight:= 320;
 
     initEverything(true);