Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename GameStatus enum to better reflect the meaning

Browse source
This commit is contained in:
Lwmte 2023-12-10 21:52:05 +01:00
parent bd4d3cc58d
commit 0c444e6434
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TombEngine/Game/control/control.cpp
View file

@ -166,12 +166,12 @@ GameStatus ControlPhase(int numFrames)
// Handle inventory / pause / load / save screens. // Handle inventory / pause / load / save screens.
auto result = HandleMenuCalls(isTitle); auto result = HandleMenuCalls(isTitle);
if (result != GameStatus::None) if (result != GameStatus::Normal)
return result; return result;
// Handle global input events. // Handle global input events.
result = HandleGlobalInputEvents(isTitle); result = HandleGlobalInputEvents(isTitle);
if (result != GameStatus::None) if (result != GameStatus::Normal)
return result; return result;
// Queued input actions are read again and cleared after UI // Queued input actions are read again and cleared after UI
@ -266,7 +266,7 @@ GameStatus ControlPhase(int numFrames)
auto time2 = std::chrono::high_resolution_clock::now(); auto time2 = std::chrono::high_resolution_clock::now();
ControlPhaseTime = (std::chrono::duration_cast<ns>(time2 - time1)).count() / 1000000; ControlPhaseTime = (std::chrono::duration_cast<ns>(time2 - time1)).count() / 1000000;
return GameStatus::None; return GameStatus::Normal;
} }
unsigned CALLBACK GameMain(void *) unsigned CALLBACK GameMain(void *)
@ -618,7 +618,7 @@ void HandleControls(bool isTitle)
GameStatus HandleMenuCalls(bool isTitle) GameStatus HandleMenuCalls(bool isTitle)
{ {
auto result = GameStatus::None; auto result = GameStatus::Normal;
if (isTitle || ScreenFading) if (isTitle || ScreenFading)
return result; return result;
@ -657,7 +657,7 @@ GameStatus HandleMenuCalls(bool isTitle)
result = GameStatus::LoadGame; result = GameStatus::LoadGame;
} }
if (result != GameStatus::None) if (result != GameStatus::Normal)
{ {
StopAllSounds(); StopAllSounds();
StopRumble(); StopRumble();
@ -672,7 +672,7 @@ GameStatus HandleGlobalInputEvents(bool isTitle)
constexpr auto DEATH_INPUT_TIMEOUT = 10 * FPS; constexpr auto DEATH_INPUT_TIMEOUT = 10 * FPS;
if (isTitle) if (isTitle)
return GameStatus::None; return GameStatus::Normal;
// Check if player dead. // Check if player dead.
if (Lara.Control.Count.Death > DEATH_NO_INPUT_TIMEOUT || if (Lara.Control.Count.Death > DEATH_NO_INPUT_TIMEOUT ||
@ -694,5 +694,5 @@ GameStatus HandleGlobalInputEvents(bool isTitle)
return GameStatus::LoadGame; return GameStatus::LoadGame;
} }
return GameStatus::None; return GameStatus::Normal;
} }

2
TombEngine/Game/control/control.h
View file

@ -15,7 +15,7 @@ struct ROOM_INFO;
enum class GameStatus enum class GameStatus
{ {
None, Normal,
NewGame, NewGame,
LoadGame, LoadGame,
SaveGame, SaveGame,