hedgewars: comparison hedgewars/hwengine.pas

equal deleted inserted replaced

-:caa1e84c3ac2
+:b69f5f22a3ba
 if (WorldEdge <> weSea) or (Theme <> 'Underwater') then
 AddClouds;
 AddFlakes;
 SetRandomSeed(cSeed, false);
 StoreLoad(false);
+if not allOK then exit;
 AssignHHCoords;
 AddMiscGears;
 InitWorld;
 ResetKbd;
 if GameType = gmtSave then
 RecountAllTeamsHealth;
 GameState:= gsGame;
 end;
 gsConfirm, gsGame, gsChat:
 begin
+// disable screenshot flash effect when about to make another screenshot
+if flagMakeCapture and (ScreenFade = sfFromWhite) then
+ScreenFade:= sfNone;
 if not cOnlyStats then
 // never place between ProcessKbd and DoGameTick - bugs due to /put cmd and isCursorVisible
 DrawWorld(Lag);
 DoGameTick(Lag);
 if not cOnlyStats then ProcessVisualGears(Lag);
 // flash
 playSound(sndShutter);
 ScreenFade:= sfFromWhite;
 ScreenFadeValue:= sfMax;
 ScreenFadeSpeed:= 5;
 if (not flagDumpLand and MakeScreenshot(s, 1, 0)) or
 (flagDumpLand and MakeScreenshot(s, 1, 1) and ((cReducedQuality and rqBlurryLand <> 0) or MakeScreenshot(s, 1, 2))) then
 WriteLnToConsole('Screenshot saved: ' + s)
 else
 begin
 procedure MainLoop;
 var event: TSDL_Event;
 PrevTime, CurrTime: LongWord;
 isTerminated: boolean;
 previousGameState: TGameState;
+wheelEvent: boolean;
 begin
 isTerminated:= false;
 PrevTime:= SDL_GetTicks;
-while isTerminated = false do
+while (not isTerminated) and allOK do
 begin
+wheelEvent:= false;
 SDL_PumpEvents();
 while SDL_PeepEvents(@event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) > 0 do
 begin
 case event.type_ of
 SDL_MOUSEBUTTONUP:
 if (GameState >= gsGame) then ProcessMouse(event.button, false);
 SDL_MOUSEWHEEL:
+begin
+wheelEvent:= true;
 ProcessMouseWheel(event.wheel.x, event.wheel.y);
+end;
-SDL_TEXTINPUT: uChat.TextInput(event.text);
+SDL_TEXTINPUT: if GameState = gsChat then uChat.TextInput(event.text);
 SDL_WINDOWEVENT:
-if event.window.event = SDL_WINDOWEVENT_SHOWN then
 begin
-cHasFocus:= true;
+case event.window.event of
-onFocusStateChanged()
+SDL_WINDOWEVENT_FOCUS_GAINED:
-end
+begin
-else if event.window.event = SDL_WINDOWEVENT_MINIMIZED then
+cHasFocus:= true;
-begin
+onFocusStateChanged();
-previousGameState:= GameState;
+end;
-GameState:= gsSuspend;
+SDL_WINDOWEVENT_FOCUS_LOST:
-end
+begin
-else if event.window.event = SDL_WINDOWEVENT_RESTORED then
+cHasFocus:= false;
-begin
+onFocusStateChanged();
-GameState:= previousGameState;
+end;
+SDL_WINDOWEVENT_MINIMIZED:
+begin
+previousGameState:= GameState;
+GameState:= gsSuspend;
+end;
+SDL_WINDOWEVENT_RESTORED:
+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
+end;
-else if event.window.event = SDL_WINDOWEVENT_RESIZED then
+SDL_WINDOWEVENT_RESIZED:
 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;
+end; // case closed
 end;
 {$IFDEF USE_TOUCH_INTERFACE}
 SDL_FINGERMOTION:
 onTouchMotion(event.tfinger.x, event.tfinger.y, event.tfinger.dx, event.tfinger.dy, event.tfinger.fingerId);
 SDL_FINGERDOWN:
 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 (not wheelEvent) then
+ResetMouseWheel();
 if (CursorMovementX <> 0) or (CursorMovementY <> 0) then
 handlePositionUpdate(CursorMovementX * cameraKeyboardSpeed, CursorMovementY * cameraKeyboardSpeed);
 if (cScreenResizeDelay <> 0) and (cScreenResizeDelay < RealTicks) and
 StopVideoRecording();
 end;
 {$ENDIF}
 ///////////////////////////////////////////////////////////////////////////////
-procedure Game;
+procedure GameRoutine;
 //var p: TPathType;
 var s: shortstring;
 i: LongInt;
 begin
-initEverything(true);
 WriteLnToConsole('Hedgewars engine ' + cVersionString + '-r' + cRevisionString +
 ' (' + cHashString + ') with protocol #' + inttostr(cNetProtoVersion));
 //AddFileLog('Prefix: "' + shortstring(PathPrefix) +'"');
 //AddFileLog('UserPrefix: "' + shortstring(UserPathPrefix) +'"');
 for i:= 0 to ParamCount do
 AddFileLog(inttostr(i) + ': ' + ParamStr(i));
 WriteToConsole('Init SDL... ');
-if not cOnlyStats then SDLTry(SDL_Init(SDL_INIT_VIDEO or SDL_INIT_NOPARACHUTE) >= 0, 'SDL_Init', true);
+if not cOnlyStats then SDLCheck(SDL_Init(SDL_INIT_VIDEO or SDL_INIT_NOPARACHUTE) >= 0, 'SDL_Init', true);
 WriteLnToConsole(msgOK);
+if not cOnlyStats then
+begin
+WriteToConsole('Init SDL_ttf... ');
+SDLCheck(TTF_Init() <> -1, 'TTF_Init', true);
+WriteLnToConsole(msgOK);
+end;
+if not allOK then exit;
 //SDL_StartTextInput();
 SDL_ShowCursor(0);
-if not cOnlyStats then
-begin
-WriteToConsole('Init SDL_ttf... ');
-SDLTry(TTF_Init() <> -1, 'TTF_Init', true);
-WriteLnToConsole(msgOK);
-end;
 {$IFDEF USE_VIDEO_RECORDING}
 if GameType = gmtRecord then
 InitOffscreenOpenGL()
 else
 end;
 ControllerInit(); // has to happen before InitKbdKeyTable to map keys
 InitKbdKeyTable();
 AddProgress();
+if not allOK then exit;
 LoadLocale(cPathz[ptLocale] + '/en.txt');  // Do an initial load with english
 if cLocaleFName <> 'en.txt' then
 begin
 // Try two letter locale first before trying specific locale overrides
 end;
 LoadLocale(cPathz[ptLocale] + '/' + cLocaleFName)
 end
 else cLocale := 'en';
+if not allOK then exit;
 WriteLnToConsole(msgGettingConfig);
 if cTestLua then
 begin
 ParseCommand('script ' + cScriptName, true);
 end
 else
 LoadRecordFromFile(recordFileName);
 end;
+if not allOK then exit;
 ScriptOnGameInit;
 s:= 'eproto ' + inttostr(cNetProtoVersion);
 SendIPCRaw(@s[0], Length(s) + 1); // send proto version
 InitTeams();
 SetSound(false);
 InitSound();
 isDeveloperMode:= false;
-TryDo(InitStepsFlags = cifAllInited, 'Some parameters not set (flags = ' + inttostr(InitStepsFlags) + ')', true);
+if checkFails(InitStepsFlags = cifAllInited, 'Some parameters not set (flags = ' + inttostr(InitStepsFlags) + ')', true) then exit;
 //ParseCommand('rotmask', true);
+if not allOK then exit;
 {$IFDEF USE_VIDEO_RECORDING}
 if GameType = gmtRecord then
 begin
 RecorderMainLoop();
 exit;
 end;
 {$ENDIF}
 MainLoop;
+end;
+procedure Game;
+begin
+initEverything(true);
+GameRoutine;
 // clean up all the memory allocated
 freeEverything(true);
 end;
 ///////////////////////////////////////////////////////////////////////////////
 // preInitEverything - init variables that are going to be ovewritten by arguments
 // initEverything - init variables only. Should be coupled by below
 // freeEverything - free above. Pay attention to the init/free order!
 procedure preInitEverything;
 begin
+allOK:= true;
 Randomize();
 uVariables.preInitModule;
 uSound.preInitModule;
 end;
 var Preview: TPreviewAlpha;
 {$ENDIF}
 begin
 initEverything(false);
-IPCWaitPongEvent;
+if allOK then
-TryDo(InitStepsFlags = cifRandomize, 'Some parameters not set (flags = ' + inttostr(InitStepsFlags) + ')', true);
+begin
+IPCWaitPongEvent;
-ScriptOnPreviewInit;
+if checkFails(InitStepsFlags = cifRandomize, 'Some parameters not set (flags = ' + inttostr(InitStepsFlags) + ')', true) then exit;
-{$IFDEF MOBILE}
-GenPreview(Preview);
+ScriptOnPreviewInit;
-{$ELSE}
+{$IFDEF MOBILE}
-GenPreviewAlpha(Preview);
+GenPreview(Preview);
-{$ENDIF}
+{$ELSE}
-WriteLnToConsole('Sending preview...');
+GenPreviewAlpha(Preview);
-SendIPCRaw(@Preview, sizeof(Preview));
+{$ENDIF}
-SendIPCRaw(@MaxHedgehogs, sizeof(byte));
+WriteLnToConsole('Sending preview...');
-WriteLnToConsole('Preview sent, disconnect');
+SendIPCRaw(@Preview, sizeof(Preview));
+SendIPCRaw(@MaxHedgehogs, sizeof(byte));
+WriteLnToConsole('Preview sent, disconnect');
+end;
 freeEverything(false);
 end;
 function EngineThread(p: pointer): Longint; cdecl; export;
 var e: TFLIBEvent;

branch	qmlfrontend
changeset 11544	b69f5f22a3ba
parent 11481	caa1e84c3ac2
parent 11534	0ead3a2e0309
child 11606	99966b4a6e1e