hedgewars: comparison hedgewars/hwengine.pas

equal deleted inserted replaced

-:3e1cca870090
+:831a25c74c7b
 procedure initEverything(complete:boolean); forward;
 procedure freeEverything(complete:boolean); forward;
 {$ENDIF}
 ////////////////////////////////
-procedure DoTimer(Lag: LongInt);
+function DoTimer(Lag: LongInt): boolean;
 var s: shortstring;
 begin
+DoTimer:= false;
 inc(RealTicks, Lag);
 case GameState of
 gsLandGen:
 begin
 DoGameTick(Lag);
 ProcessVisualGears(Lag);
 end;
 gsExit:
 begin
-isTerminated:= true;
+DoTimer:= true;
 end;
 gsSuspend:
 exit;
 end;
 SDL_DestroyWindow(SDLwindow);
 SDLGLcontext:= nil;
 SDLwindow:= nil;
 {$ENDIF}
 SDL_Quit();
-isTerminated:= false;
 end;
 ///////////////////
 procedure MainLoop;
 var event: TSDL_Event;
 PrevTime, CurrTime: Longword;
+isTerminated: boolean;
 {$IFDEF SDL13}
 previousGameState: TGameState;
 {$ELSE}
 prevFocusState: boolean;
 {$ENDIF}
 begin
+isTerminated:= false;
 PrevTime:= SDL_GetTicks;
 while isTerminated = false do
 begin
 SDL_PumpEvents();
 while SDL_PeepEvents(@event, 1, SDL_GETEVENT, {$IFDEF SDL13}SDL_FIRSTEVENT, SDL_LASTEVENT{$ELSE}SDL_ALLEVENTS{$ENDIF}) > 0 do
 begin
 case event.type_ of
 {$IFDEF SDL13}
 SDL_KEYDOWN:
 if GameState = gsChat then
 // sdl on iphone supports only ashii keyboards and the unicode field is deprecated in sdl 1.3
 KeyPressChat(SDL_GetKeyFromScancode(event.key.keysym.sym))//TODO correct for keymodifiers
 else
 ProcessKey(event.key);
 SDL_KEYUP:
 if GameState <> gsChat then
 ProcessKey(event.key);
 SDL_WINDOWEVENT:
 if event.window.event = SDL_WINDOWEVENT_SHOWN then
 begin
 cHasFocus:= true;
 onFocusStateChanged()
 end
 else if event.window.event = SDL_WINDOWEVENT_MINIMIZED then
 begin
 previousGameState:= GameState;
 GameState:= gsSuspend;
 end
 else if event.window.event = SDL_WINDOWEVENT_RESTORED then
 begin
 GameState:= previousGameState;
 {$IFDEF ANDROID}
 //This call is used to reinitialize the glcontext and reload the textures
 ParseCommand('fullscr '+intToStr(LongInt(cFullScreen)), true);
 {$ENDIF}
 end
 else if event.window.event = SDL_WINDOWEVENT_RESIZED then
 begin
 cNewScreenWidth:= max(2 * (event.window.data1 div 2), cMinScreenWidth);
 cNewScreenHeight:= max(2 * (event.window.data2 div 2), cMinScreenHeight);
 cScreenResizeDelay:= RealTicks + 500{$IFDEF IPHONEOS}div 2{$ENDIF};
 end;
 SDL_FINGERMOTION:
 onTouchMotion(event.tfinger.x, event.tfinger.y,event.tfinger.dx, event.tfinger.dy, event.tfinger.fingerId);
 SDL_FINGERDOWN:
 if GameState = gsChat then
 KeyPressChat(event.key.keysym.unicode)
 else
 ProcessKey(event.key);
 SDL_KEYUP:
 if GameState <> gsChat then
 ProcessKey(event.key);
 SDL_MOUSEBUTTONDOWN:
 ProcessMouse(event.button, true);
 SDL_MOUSEBUTTONUP:
 ProcessMouse(event.button, false);
 SDL_ACTIVEEVENT:
 if (event.active.state and SDL_APPINPUTFOCUS) <> 0 then
 begin
 prevFocusState:= cHasFocus;
 cHasFocus:= event.active.gain = 1;
 if prevFocusState xor cHasFocus then
 onFocusStateChanged()
 end;
 SDL_VIDEORESIZE:
 begin
 // using lower values than cMinScreenWidth or cMinScreenHeight causes widget overlap and off-screen widget parts
 // Change by sheepluva:
 // Let's only use even numbers for custom width/height since I ran into scaling issues with odd width values.
 // Maybe just fixes the symptom not the actual cause(?), I'm too tired to find out :P
 cNewScreenWidth:= max(2 * (event.resize.w div 2), cMinScreenWidth);
 cNewScreenHeight:= max(2 * (event.resize.h div 2), cMinScreenHeight);
 cScreenResizeDelay:= RealTicks+500;
 end;
 {$ENDIF}
 SDL_JOYAXISMOTION:
 ControllerAxisEvent(event.jaxis.which, event.jaxis.axis, event.jaxis.value);
 SDL_JOYHATMOTION:
 ControllerHatEvent(event.jhat.which, event.jhat.hat, event.jhat.value);
 ControllerButtonEvent(event.jbutton.which, event.jbutton.button, true);
 SDL_JOYBUTTONUP:
 ControllerButtonEvent(event.jbutton.which, event.jbutton.button, false);
 SDL_QUITEV:
 isTerminated:= true
 end; //end case event.type_ of
 end; //end while SDL_PollEvent(@event) <> 0 do
 if (cScreenResizeDelay <> 0) and (cScreenResizeDelay < RealTicks) and
 ((cNewScreenWidth <> cScreenWidth) or (cNewScreenHeight <> cScreenHeight)) then
 begin
 cScreenResizeDelay:= 0;
 cScreenWidth:= cNewScreenWidth;
 cScreenHeight:= cNewScreenHeight;
 ParseCommand('fullscr '+intToStr(LongInt(cFullScreen)), true);
 WriteLnToConsole('window resize: ' + IntToStr(cScreenWidth) + ' x ' + IntToStr(cScreenHeight));
 ScriptOnScreenResize();
 InitCameraBorders();
 InitTouchInterface();
 end;
-if isTerminated = false then
+CurrTime:= SDL_GetTicks();
-begin
-CurrTime:= SDL_GetTicks;
 if PrevTime + longword(cTimerInterval) <= CurrTime then
 begin
-DoTimer(CurrTime - PrevTime);
+isTerminated:= DoTimer(CurrTime - PrevTime);
 PrevTime:= CurrTime
 end
 else SDL_Delay(1);
 IPCCheckSock();
-end;
 end;
 end;
 ///////////////
 procedure Game{$IFDEF HWLIBRARY}(gameArgs: PPChar); cdecl; export{$ENDIF};
-var
+var p: TPathType;
-p: TPathType;
 s: shortstring;
 i: LongInt;
 begin
 {$IFDEF HWLIBRARY}
 cBits:= 32;

changeset 7025	831a25c74c7b
parent 7021	0c75512a8920
child 7026	8d1724e1337e