diff options
author | Michael <60937741+majesticCoding@users.noreply.github.com> | 2021-01-09 16:36:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-09 16:36:44 +0100 |
commit | 5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3 (patch) | |
tree | 672024c0e3bf8cc3e0b96a89d6bed0680ab5284c /src/render | |
parent | Allocator fix (diff) | |
parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
download | re3-5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3.tar re3-5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3.tar.gz re3-5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3.tar.bz2 re3-5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3.tar.lz re3-5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3.tar.xz re3-5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3.tar.zst re3-5a5f06ef2a40ba52cca60071cb95687fc8a0b1c3.zip |
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/Hud.cpp | 2 | ||||
-rw-r--r-- | src/render/WaterCreatures.cpp | 4 | ||||
-rw-r--r-- | src/render/WaterCreatures.h | 3 | ||||
-rw-r--r-- | src/render/WaterLevel.cpp | 13 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index 3432f32c..1c870fd2 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -481,7 +481,7 @@ void CHud::Draw() CBaseModelInfo *weaponModel = CModelInfo::GetModelInfo(weaponInfo->m_nModelId); RwTexDictionary *weaponTxd = CTxdStore::GetSlot(weaponModel->GetTxdSlot())->texDict; if (weaponTxd) { - RwTexture *weaponIcon = RwTexDictionaryFindNamedTexture(weaponTxd, weaponModel->GetName()); + RwTexture *weaponIcon = RwTexDictionaryFindNamedTexture(weaponTxd, weaponModel->GetModelName()); if (weaponIcon) { RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR); #ifndef FIX_BUGS diff --git a/src/render/WaterCreatures.cpp b/src/render/WaterCreatures.cpp index d3bd2701..b44f987c 100644 --- a/src/render/WaterCreatures.cpp +++ b/src/render/WaterCreatures.cpp @@ -7,6 +7,7 @@ #include "config.h" #include "General.h" +/* int CWaterCreatures::nNumActiveSeaLifeForms; CWaterCreature CWaterCreatures::aWaterCreatures[NUM_WATER_CREATURES]; @@ -271,4 +272,5 @@ void CWaterCreatures::RemoveAll() { nNumActiveSeaLifeForms--; } } -}
\ No newline at end of file +} +*/
\ No newline at end of file diff --git a/src/render/WaterCreatures.h b/src/render/WaterCreatures.h index 9ef8198c..0b8d2376 100644 --- a/src/render/WaterCreatures.h +++ b/src/render/WaterCreatures.h @@ -1,6 +1,7 @@ #pragma once #include "Object.h" +/* enum eFishSlotState { WATER_CREATURE_INIT = 0, WATER_CREATURE_ACTIVE, @@ -45,4 +46,4 @@ struct WaterCreatureProperties { float fLevel; float fUnknown; //unused float fWaterDepth; -};
\ No newline at end of file +};*/
\ No newline at end of file diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp index 854653f0..6caac31e 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -1175,13 +1175,13 @@ CWaterLevel::RenderWater() if ( WavesCalculatedThisFrame ) { RenderSeaBirds(); - RenderShipsOnHorizon(); - CParticle::HandleShipsAtHorizonStuff(); - HandleBeachToysStuff(); + //RenderShipsOnHorizon(); + //CParticle::HandleShipsAtHorizonStuff(); + //HandleBeachToysStuff(); } - if ( _bSeaLife ) - HandleSeaLifeForms(); + //if ( _bSeaLife ) + // HandleSeaLifeForms(); DefinedState(); } @@ -3105,6 +3105,7 @@ CWaterLevel::RenderShipsOnHorizon() } } +/* void CWaterLevel::HandleSeaLifeForms() { @@ -3145,7 +3146,7 @@ CWaterLevel::HandleSeaLifeForms() } CWaterCreatures::UpdateAll(); -} +}*/ void CWaterLevel::HandleBeachToysStuff(void) |