summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/render/Console.cpp2
-rw-r--r--src/render/Particle.cpp3
-rw-r--r--src/render/ParticleMgr.h12
-rw-r--r--src/render/PlayerSkin.cpp2
-rw-r--r--src/render/Shadows.cpp6
-rw-r--r--src/render/Shadows.h12
-rw-r--r--src/render/WaterLevel.cpp2
-rw-r--r--src/render/WaterLevel.h2
8 files changed, 17 insertions, 24 deletions
diff --git a/src/render/Console.cpp b/src/render/Console.cpp
index 5ae5d763..8ea5b7a3 100644
--- a/src/render/Console.cpp
+++ b/src/render/Console.cpp
@@ -17,7 +17,7 @@ CConsole::AddLine(char *s, uint8 r, uint8 g, uint8 b)
char tempstr[MAX_STR_LEN+1];
while (strlen(s) > MAX_STR_LEN) {
- strncpy_s(tempstr, s, MAX_STR_LEN);
+ strncpy(tempstr, s, MAX_STR_LEN);
tempstr[MAX_STR_LEN-1] = '\0';
s += MAX_STR_LEN - 1;
AddOneLine(tempstr, r, g, b);
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index 3babbe44..e73cd9a7 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/ParticleMgr.h b/src/render/ParticleMgr.h
index 42e3f132..0100bb65 100644
--- a/src/render/ParticleMgr.h
+++ b/src/render/ParticleMgr.h
@@ -4,7 +4,7 @@
class CParticle;
-enum
+enum
{
ZCHECK_FIRST = BIT(0),
ZCHECK_STEP = BIT(1),
@@ -60,14 +60,12 @@ struct tParticleSystemData
uint8 m_InitialColorVariation;
RwRGBA m_FadeDestinationColor;
uint32 m_ColorFadeTime;
-
+
RwRaster **m_ppRaster;
CParticle *m_pParticles;
};
-#ifdef CHECK_STRUCT_SIZES
VALIDATE_SIZE(tParticleSystemData, 0x88);
-#endif
class cParticleSystemMgr
{
@@ -121,14 +119,12 @@ public:
tParticleSystemData m_aParticles[MAX_PARTICLES];
cParticleSystemMgr();
-
+
void Initialise();
void LoadParticleData();
void RangeCheck(tParticleSystemData *pData) { }
};
-#ifdef CHECK_STRUCT_SIZES
VALIDATE_SIZE(cParticleSystemMgr, 0x2420);
-#endif
-extern cParticleSystemMgr mod_ParticleSystemManager; \ No newline at end of file
+extern cParticleSystemMgr mod_ParticleSystemManager;
diff --git a/src/render/PlayerSkin.cpp b/src/render/PlayerSkin.cpp
index 94af1fd1..d66f7ce4 100644
--- a/src/render/PlayerSkin.cpp
+++ b/src/render/PlayerSkin.cpp
@@ -123,7 +123,7 @@ void
CPlayerSkin::BeginFrontendSkinEdit(void)
{
LoadPlayerDff();
- RpClumpForAllAtomics(gpPlayerClump, CClumpModelInfo::SetAtomicRendererCB, CVisibilityPlugins::RenderPlayerCB);
+ RpClumpForAllAtomics(gpPlayerClump, CClumpModelInfo::SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
CWorld::Players[0].LoadPlayerSkin();
gOldFov = CDraw::GetFOV();
CDraw::SetFOV(30.0f);
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index cefc1d9f..69f9dce0 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -645,7 +645,7 @@ CShadows::StoreShadowForPole(CEntity *pPole, float fOffsetX, float fOffsetY, flo
PolePos.x += -CTimeCycle::GetSunPosition().x * (fPoleHeight / 2);
PolePos.y += -CTimeCycle::GetSunPosition().y * (fPoleHeight / 2);
- StoreStaticShadow((uint32)pPole + nID + _TODOCONST(51), SHADOWTYPE_DARK, gpPostShadowTex, &PolePos,
+ StoreStaticShadow((uintptr)pPole + nID + _TODOCONST(51), SHADOWTYPE_DARK, gpPostShadowTex, &PolePos,
-CTimeCycle::GetSunPosition().x * (fPoleHeight / 2),
-CTimeCycle::GetSunPosition().y * (fPoleHeight / 2),
CTimeCycle::GetShadowSideX() * fPoleWidth,
@@ -1516,7 +1516,7 @@ CShadows::UpdatePermanentShadows(void)
// timePassed == aPermanentShadows[i].m_nLifeTime -> 0
float fMult = 1.0f - float(timePassed - (aPermanentShadows[i].m_nLifeTime * 3 / 4)) / (aPermanentShadows[i].m_nLifeTime / 4);
- StoreStaticShadow((uint32)&aPermanentShadows[i],
+ StoreStaticShadow((uintptr)&aPermanentShadows[i],
aPermanentShadows[i].m_nType,
aPermanentShadows[i].m_pTexture,
&aPermanentShadows[i].m_vecPos,
@@ -1533,7 +1533,7 @@ CShadows::UpdatePermanentShadows(void)
}
else
{
- StoreStaticShadow((uint32)&aPermanentShadows[i],
+ StoreStaticShadow((uintptr)&aPermanentShadows[i],
aPermanentShadows[i].m_nType,
aPermanentShadows[i].m_pTexture,
&aPermanentShadows[i].m_vecPos,
diff --git a/src/render/Shadows.h b/src/render/Shadows.h
index ef56d336..63aaaaf2 100644
--- a/src/render/Shadows.h
+++ b/src/render/Shadows.h
@@ -52,9 +52,7 @@ public:
{ }
};
-#ifdef CHECK_STRUCT_SIZES
VALIDATE_SIZE(CStoredShadow, 0x30);
-#endif
class CPolyBunch
{
@@ -69,9 +67,7 @@ public:
{ }
};
-#ifdef CHECK_STRUCT_SIZES
VALIDATE_SIZE(CPolyBunch, 0x6C);
-#endif
class CStaticShadow
{
@@ -93,16 +89,14 @@ public:
bool m_bRendered;
bool m_bTemp;
RwTexture *m_pTexture;
-
+
CStaticShadow()
{ }
void Free();
};
-#ifdef CHECK_STRUCT_SIZES
VALIDATE_SIZE(CStaticShadow, 0x40);
-#endif
class CPermanentShadow
{
@@ -120,7 +114,7 @@ public:
uint32 m_nTimeCreated;
uint32 m_nLifeTime;
RwTexture *m_pTexture;
-
+
CPermanentShadow()
{ }
};
@@ -168,7 +162,7 @@ public:
static void GeneratePolysForStaticShadow (int16 nStaticShadowID);
static void CastShadowSectorList (CPtrList &PtrList, float fStartX, float fStartY, float fEndX, float fEndY,
CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance, float fScale, CPolyBunch **ppPolyBunch);
- static void CastShadowEntity (CEntity *pEntity, float fStartX, float fStartY, float fEndX, float fEndY,
+ static void CastShadowEntity (CEntity *pEntity, float fStartX, float fStartY, float fEndX, float fEndY,
CVector *pPosn, float fFrontX, float fFrontY, float fSideX, float fSideY, int16 nIntensity, uint8 nRed, uint8 nGreen, uint8 nBlue, float fZDistance, float fScale, CPolyBunch **ppPolyBunch);
static void UpdateStaticShadows (void);
static void UpdatePermanentShadows (void);
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 66debd68..f1ccccb3 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -49,7 +49,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 2fe2e103..435692c1 100644
--- a/src/render/WaterLevel.h
+++ b/src/render/WaterLevel.h
@@ -81,7 +81,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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 20:47:11 +0100