diff options
author | aap <aap@papnet.eu> | 2019-06-30 13:37:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-30 13:37:52 +0200 |
commit | 9b5a7cd4bb6d106e10e4502f123814f4ece44a2f (patch) | |
tree | 3ca33433362742fad0a4342b1047f992c70602c9 /src/render/Hud.cpp | |
parent | Merge pull request #77 from Nick007J/master (diff) | |
parent | Cleanup project a bit (diff) | |
download | re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.gz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.bz2 re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.lz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.xz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.zst re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/render/Hud.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index 6ade9b60..83e62ba0 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -543,7 +543,7 @@ void CHud::Draw() } } else { - m_pLastZoneName = 0; + m_pLastZoneName = nil; m_ZoneState = 0; m_ZoneFadeTimer = 0; m_ZoneNameTimer = 0; @@ -639,7 +639,7 @@ void CHud::Draw() } } else { - m_pLastVehicleName = 0; + m_pLastVehicleName = nil; m_VehicleState = 0; m_VehicleFadeTimer = 0; m_VehicleNameTimer = 0; @@ -1234,9 +1234,9 @@ WRAPPER void CHud::GetRidOfAllHudMessages(void) { EAXJMP(0x504F90); } void CHud::GetRidOfAllHudMessages() { m_ZoneState = 0; - m_pLastZoneName = 0; + m_pLastZoneName = nil; m_ZoneNameTimer = 0; - m_pZoneName = 0; + m_pZoneName = nil; for (int i = 0; i < 256; i++) { m_HelpMessage[i] = 0; @@ -1249,9 +1249,9 @@ void CHud::GetRidOfAllHudMessages() m_HelpMessageState = 0; m_HelpMessageQuick = 0; m_HelpMessageDisplayTime = 1.0f; - m_VehicleName = 0; - m_pLastVehicleName = 0; - m_pVehicleNameToPrint = 0; + m_VehicleName = nil; + m_pLastVehicleName = nil; + m_pVehicleNameToPrint = nil; m_VehicleNameTimer = 0; m_VehicleFadeTimer = 0; m_VehicleState = 0; @@ -1284,8 +1284,8 @@ void CHud::Initialise() Sprites[i].SetTexture(WeaponFilenames[i * 2]); } - gpSniperSightTex = RwTextureRead("sitesniper", 0); - gpRocketSightTex = RwTextureRead("siterocket", 0); + gpSniperSightTex = RwTextureRead("sitesniper", nil); + gpRocketSightTex = RwTextureRead("siterocket", nil); CTxdStore::PopCurrentTxd(); } @@ -1427,10 +1427,10 @@ void CHud::Shutdown() } RwTextureDestroy(gpSniperSightTex); - gpSniperSightTex = 0; + gpSniperSightTex = nil; RwTextureDestroy(gpRocketSightTex); - gpRocketSightTex = 0; + gpRocketSightTex = nil; int HudTXD = CTxdStore::FindTxdSlot("hud"); CTxdStore::RemoveTxdSlot(HudTXD); |