diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-03-29 15:35:50 +0200 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-03-29 15:35:50 +0200 |
| commit | 7b95dcc219f220ef12df2ea63fe9671ac72268d9 (patch) | |
| tree | 0452c5745e55dea2c21f7f752296141a758b3c5f | |
| parent | style & cosmetic fixes (diff) | |
| download | re3-7b95dcc219f220ef12df2ea63fe9671ac72268d9.tar re3-7b95dcc219f220ef12df2ea63fe9671ac72268d9.tar.gz re3-7b95dcc219f220ef12df2ea63fe9671ac72268d9.tar.bz2 re3-7b95dcc219f220ef12df2ea63fe9671ac72268d9.tar.lz re3-7b95dcc219f220ef12df2ea63fe9671ac72268d9.tar.xz re3-7b95dcc219f220ef12df2ea63fe9671ac72268d9.tar.zst re3-7b95dcc219f220ef12df2ea63fe9671ac72268d9.zip | |
| -rw-r--r-- | src/core/Game.cpp | 8 | ||||
| -rw-r--r-- | src/render/WeaponEffects.cpp | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 8dd90d94..e6bedf32 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -237,9 +237,6 @@ bool CGame::InitialiseOnceAfterRW(void) return true; } -#if 0 -WRAPPER void CGame::FinalShutdown(void) { EAXJMP(0x48BEC0); } -#else void CGame::FinalShutdown(void) { @@ -247,7 +244,6 @@ CGame::FinalShutdown(void) CPedStats::Shutdown(); CdStreamShutdown(); } -#endif bool CGame::Initialise(const char* datFile) { @@ -604,9 +600,6 @@ void CGame::InitialiseWhenRestarting(void) DMAudio.ChangeMusicMode(MUSICMODE_GAME); } -#if 0 -WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); } -#else extern void (*DebugMenuProcess)(void); void CGame::Process(void) { @@ -682,7 +675,6 @@ void CGame::Process(void) } } } -#endif void CGame::DrasticTidyUpMemory(bool) { diff --git a/src/render/WeaponEffects.cpp b/src/render/WeaponEffects.cpp index cbab25a5..2ed9e662 100644 --- a/src/render/WeaponEffects.cpp +++ b/src/render/WeaponEffects.cpp @@ -36,7 +36,7 @@ CWeaponEffects::Init(void) int32 slot = CTxdStore::FindTxdSlot("particle"); CTxdStore::SetCurrentTxd(slot); - gpCrossHairTex = RwTextureRead("crosshair", NULL); + gpCrossHairTex = RwTextureRead("crosshair", nil); gpCrossHairRaster = RwTextureGetRaster(gpCrossHairTex); CTxdStore::PopCurrentTxd(); |