summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorshfil <filip.gawin@zoho.com>2020-05-12 23:42:52 +0200
committerGitHub <noreply@github.com>2020-05-12 23:42:52 +0200
commitbd8a0e73056ae11f113c6859fecc3fbe3376dc0b (patch)
treecf51d6ab8430cd186e02f0e8105004f8e5476728 /src/render
parentfix shotgun (diff)
parentFix linux warnings (diff)
downloadre3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar
re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.gz
re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.bz2
re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.lz
re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.xz
re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.tar.zst
re3-bd8a0e73056ae11f113c6859fecc3fbe3376dc0b.zip
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Particle.cpp3
-rw-r--r--src/render/Renderer.cpp5
-rw-r--r--src/render/WaterLevel.cpp2
-rw-r--r--src/render/WaterLevel.h2
4 files changed, 9 insertions, 3 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index 5995432b..4223ac10 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -984,6 +984,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
case PARTICLE_WATER_HYDRANT:
pParticle->m_vecPosition.z += 20.0f * psystem->m_fPositionRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE];
break;
+ default: break;
}
if ( fSize != 0.0f )
@@ -1214,6 +1215,7 @@ void CParticle::Update()
continue;
}
break;
+ default: break;
}
}
}
@@ -1295,6 +1297,7 @@ void CParticle::Update()
continue;
}
break;
+ default: break;
}
}
}
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 1f1e3b50..8a48eb11 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1174,6 +1174,7 @@ CRenderer::IsEntityCullZoneVisible(CEntity *ent)
if(!obj->IsStatic())
return true;
return !(obj->m_pCurSurface && obj->m_pCurSurface->bZoneCulled2);
+ default: break;
}
return true;
}
@@ -1182,12 +1183,14 @@ bool
CRenderer::IsVehicleCullZoneVisible(CEntity *ent)
{
CVehicle *v = (CVehicle*)ent;
- switch(v->GetStatus())
+ switch(v->GetStatus()) {
case STATUS_SIMPLE:
case STATUS_PHYSICS:
case STATUS_ABANDONED:
case STATUS_WRECKED:
return !(v->m_pCurGroundEntity && v->m_pCurGroundEntity->bZoneCulled2);
+ default: break;
+ }
return true;
}
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index e8e79f96..1a28ce83 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -52,7 +52,7 @@ const float fBlueMult = 1.4f;
void
-CWaterLevel::Initialise(char *pWaterDat)
+CWaterLevel::Initialise(Const char *pWaterDat)
{
ms_nNoOfWaterLevels = 0;
diff --git a/src/render/WaterLevel.h b/src/render/WaterLevel.h
index a471bc52..985c9744 100644
--- a/src/render/WaterLevel.h
+++ b/src/render/WaterLevel.h
@@ -79,7 +79,7 @@ class CWaterLevel
static int16 nGeomUsed;
public:
- static void Initialise(char *pWaterDat);
+ static void Initialise(Const char *pWaterDat);
static void Shutdown();
static void CreateWavyAtomic();
static void DestroyWavyAtomic();