From 8be05679249367b39bcee1e07d6831d11918210b Mon Sep 17 00:00:00 2001 From: aap Date: Fri, 8 Jan 2021 13:51:42 +0100 Subject: little fixes --- src/render/Timecycle.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/render') diff --git a/src/render/Timecycle.cpp b/src/render/Timecycle.cpp index b20a2443..70926c1a 100644 --- a/src/render/Timecycle.cpp +++ b/src/render/Timecycle.cpp @@ -172,8 +172,9 @@ CTimeCycle::Initialise(void) for(w = 0; w < NUMWEATHERS; w++) for(h = 0; h < NUMHOURS; h++){ li = 0; - while(work_buff[bi] == '/'){ - while(work_buff[bi] != '\n') + while(work_buff[bi] == '/' || work_buff[bi] == '\n' || + work_buff[bi] == '\0' || work_buff[bi] == ' ' || work_buff[bi] == '\r'){ + while(work_buff[bi] != '\n' && work_buff[bi] != '\0' && work_buff[bi] != '\r') bi++; bi++; } -- cgit v1.2.3 From e9001207ea5c3d2c9bbabb74cd7996985d575d85 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Fri, 8 Jan 2021 18:26:35 +0200 Subject: Disable water creatures --- src/render/WaterCreatures.cpp | 4 +++- src/render/WaterCreatures.h | 3 ++- src/render/WaterLevel.cpp | 13 +++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'src/render') 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) -- cgit v1.2.3 From faa9e6441bc4b02362620d0cf599a8513744f4cc Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Fri, 8 Jan 2021 21:53:11 +0200 Subject: Use original names --- src/render/Hud.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/render') 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 -- cgit v1.2.3 From 219af601028dbb9acff0b506dd1d7ac4ec99db17 Mon Sep 17 00:00:00 2001 From: aap Date: Fri, 8 Jan 2021 23:53:14 +0100 Subject: timecycle back to normal --- src/render/Timecycle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/render') diff --git a/src/render/Timecycle.cpp b/src/render/Timecycle.cpp index af70a9f3..3cb5a0b0 100644 --- a/src/render/Timecycle.cpp +++ b/src/render/Timecycle.cpp @@ -228,7 +228,7 @@ CTimeCycle::Initialise(void) for(h = 0; h < NUMHOURS; h++){ li = 0; while(work_buff[bi] == '/' || work_buff[bi] == '\n' || - work_buff[bi] == '\0' || work_buff[bi] == ' ' || work_buff[bi] == '\r'){ + work_buff[bi] == '\0' || work_buff[bi] == '\r'){ while(work_buff[bi] != '\n' && work_buff[bi] != '\0' && work_buff[bi] != '\r') bi++; bi++; -- cgit v1.2.3