diff options
author | aap <aap@papnet.eu> | 2021-01-03 17:01:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-03 17:01:17 +0100 |
commit | 65796459343a01ddd17170104599ae340b90bb1d (patch) | |
tree | d16a5bc09e9cebd006085f30a27dfb3567927ee7 /src/core/Game.cpp | |
parent | Merge pull request #921 from TheOfficialFloW/patch-2 (diff) | |
parent | Pad2 fix (diff) | |
download | re3-65796459343a01ddd17170104599ae340b90bb1d.tar re3-65796459343a01ddd17170104599ae340b90bb1d.tar.gz re3-65796459343a01ddd17170104599ae340b90bb1d.tar.bz2 re3-65796459343a01ddd17170104599ae340b90bb1d.tar.lz re3-65796459343a01ddd17170104599ae340b90bb1d.tar.xz re3-65796459343a01ddd17170104599ae340b90bb1d.tar.zst re3-65796459343a01ddd17170104599ae340b90bb1d.zip |
Diffstat (limited to 'src/core/Game.cpp')
-rw-r--r-- | src/core/Game.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 348ac26d..8405c2ec 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -96,6 +96,7 @@ #include "postfx.h" #include "custompipes.h" #include "screendroplets.h" +#include "VarConsole.h" #ifdef USE_TEXTURE_POOL #include "TexturePools.h" #endif @@ -113,6 +114,10 @@ char CGame::aDatFile[32]; bool CGame::russianGame = false; bool CGame::japaneseGame = false; #endif +#ifndef MASTER +CVector CGame::PlayerCoords; +bool8 CGame::VarUpdatePlayerCoords; +#endif int gameTxdSlot; @@ -557,6 +562,16 @@ bool CGame::Initialise(const char* datFile) #ifdef USE_TEXTURE_POOL _TexturePoolsUnknown(true); #endif + +#ifndef MASTER + PlayerCoords = FindPlayerCoors(); + VarConsole.Add("X PLAYER COORD", &PlayerCoords.x, 10.0f, -10000.0f, 10000.0f, true); + VarConsole.Add("Y PLAYER COORD", &PlayerCoords.y, 10.0f, -10000.0f, 10000.0f, true); + VarConsole.Add("Z PLAYER COORD", &PlayerCoords.z, 10.0f, -10000.0f, 10000.0f, true); + VarConsole.Add("UPDATE PLAYER COORD", &VarUpdatePlayerCoords, true); +#endif + + DMAudio.SetStartingTrackPositions(true); DMAudio.ChangeMusicMode(MUSICMODE_GAME); return true; @@ -837,6 +852,12 @@ void CGame::Process(void) CWindModifiers::Number = 0; if (!CTimer::GetIsPaused()) { +#ifndef MASTER + if (VarUpdatePlayerCoords) { + FindPlayerPed()->Teleport(PlayerCoords); + VarUpdatePlayerCoords = false; + } +#endif CSprite2d::SetRecipNearClip(); CSprite2d::InitPerFrame(); CFont::InitPerFrame(); |