diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-15 00:10:50 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-15 00:10:50 +0300 |
| commit | e373d0526ef07183cba8e89aba46f2ab416e67ba (patch) | |
| tree | e6b2052e078cd2ad2ae1503262421c6858a20a0f /src/control/GameLogic.h | |
| parent | c9ace44ca8abca62ece0012362b94b115be65e1b (diff) | |
| parent | 6d934892ecd3c4b6f025fbe2c4e6504fd979d391 (diff) | |
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Hud.h
# src/text/Messages.cpp
# src/text/Text.cpp
Diffstat (limited to 'src/control/GameLogic.h')
| -rw-r--r-- | src/control/GameLogic.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/control/GameLogic.h b/src/control/GameLogic.h index db626558..43e244a3 100644 --- a/src/control/GameLogic.h +++ b/src/control/GameLogic.h @@ -1,13 +1,13 @@ -#pragma once
-
-class CGameLogic
-{
-public:
- static void InitAtStartOfGame();
- static void PassTime(uint32 time);
- static void SortOutStreamingAndMemory(const CVector &pos);
- static void Update();
- static void RestorePlayerStuffDuringResurrection(class CPlayerPed *pPlayerPed, CVector pos, float angle);
-
- static uint8 ActivePlayers;
+#pragma once + +class CGameLogic +{ +public: + static void InitAtStartOfGame(); + static void PassTime(uint32 time); + static void SortOutStreamingAndMemory(const CVector &pos); + static void Update(); + static void RestorePlayerStuffDuringResurrection(class CPlayerPed *pPlayerPed, CVector pos, float angle); + + static uint8 ActivePlayers; };
\ No newline at end of file |