summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2020-04-02 04:37:22 +0200
committerGitHub <noreply@github.com>2020-04-02 04:37:22 +0200
commitc394bd2a6e7cd12f40906543cf3e60cf2283145e (patch)
treea4f422e07368fc7cbea02fda9e027cb7207a34a3
parentGlass done (diff)
downloadre3-c394bd2a6e7cd12f40906543cf3e60cf2283145e.tar
re3-c394bd2a6e7cd12f40906543cf3e60cf2283145e.tar.gz
re3-c394bd2a6e7cd12f40906543cf3e60cf2283145e.tar.bz2
re3-c394bd2a6e7cd12f40906543cf3e60cf2283145e.tar.lz
re3-c394bd2a6e7cd12f40906543cf3e60cf2283145e.tar.xz
re3-c394bd2a6e7cd12f40906543cf3e60cf2283145e.tar.zst
re3-c394bd2a6e7cd12f40906543cf3e60cf2283145e.zip
Diffstat (limited to '')
-rw-r--r--src/render/Glass.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp
index b082a9e1..41d31985 100644
--- a/src/render/Glass.cpp
+++ b/src/render/Glass.cpp
@@ -21,7 +21,7 @@ CFallingGlassPane CGlass::aGlassPanes[NUM_GLASSPANES];
CVector2D CentersWithTriangle[NUM_GLASSTRIANGLES];
-CVector2D CoorsWithTriangle[NUM_GLASSTRIANGLES][3] =
+const CVector2D CoorsWithTriangle[NUM_GLASSTRIANGLES][3] =
{
{
CVector2D(0.0f, 0.0f),
@@ -116,7 +116,7 @@ CFallingGlassPane::Update(void)
CParticle::AddParticle(PARTICLE_CAR_DEBRIS,
pos,
dir,
- NULL,
+ nil,
CGeneral::GetRandomNumberInRange(0.02f, 0.2f),
color,
CGeneral::GetRandomNumberInRange(-40, 40),
@@ -287,7 +287,7 @@ CGlass::FindFreePane(void)
return &aGlassPanes[i];
}
- return NULL;
+ return nil;
}
void
@@ -539,7 +539,7 @@ CGlass::RenderHiLightPolys(void)
LittleTest();
- if ( RwIm3DTransform(TempBufferRenderVertices, TempBufferVerticesStoredHiLight, NULL, rwIM3D_VERTEXUV) )
+ if ( RwIm3DTransform(TempBufferRenderVertices, TempBufferVerticesStoredHiLight, nil, rwIM3D_VERTEXUV) )
{
RwIm3DRenderIndexedPrimitive(rwPRIMTYPETRILIST, TempBufferRenderIndexList, TempBufferIndicesStoredHiLight);
RwIm3DEnd();
@@ -561,7 +561,7 @@ CGlass::RenderShatteredPolys(void)
LittleTest();
- if ( RwIm3DTransform(&TempBufferRenderVertices[TEMPBUFFERVERTSHATTEREDOFFSET], TempBufferVerticesStoredShattered - TEMPBUFFERVERTSHATTEREDOFFSET, NULL, rwIM3D_VERTEXUV) )
+ if ( RwIm3DTransform(&TempBufferRenderVertices[TEMPBUFFERVERTSHATTEREDOFFSET], TempBufferVerticesStoredShattered - TEMPBUFFERVERTSHATTEREDOFFSET, nil, rwIM3D_VERTEXUV) )
{
RwIm3DRenderIndexedPrimitive(rwPRIMTYPETRILIST, &TempBufferRenderIndexList[TEMPBUFFERINDEXSHATTEREDOFFSET], TempBufferIndicesStoredShattered - TEMPBUFFERINDEXSHATTEREDOFFSET);
RwIm3DEnd();
@@ -583,7 +583,7 @@ CGlass::RenderReflectionPolys(void)
LittleTest();
- if ( RwIm3DTransform(&TempBufferRenderVertices[TEMPBUFFERVERTREFLECTIONOFFSET], TempBufferVerticesStoredReflection - TEMPBUFFERVERTREFLECTIONOFFSET, NULL, rwIM3D_VERTEXUV) )
+ if ( RwIm3DTransform(&TempBufferRenderVertices[TEMPBUFFERVERTREFLECTIONOFFSET], TempBufferVerticesStoredReflection - TEMPBUFFERVERTREFLECTIONOFFSET, nil, rwIM3D_VERTEXUV) )
{
RwIm3DRenderIndexedPrimitive(rwPRIMTYPETRILIST, &TempBufferRenderIndexList[TEMPBUFFERINDEXREFLECTIONOFFSET], TempBufferIndicesStoredReflection - TEMPBUFFERINDEXREFLECTIONOFFSET);
RwIm3DEnd();
@@ -718,4 +718,4 @@ STARTPATCHES
//InjectHook(0x504880, `global constructor keyed to'glass.cpp, PATCH_JUMP);
//InjectHook(0x5048D0, CFallingGlassPane::~CFallingGlassPane, PATCH_JUMP);
//InjectHook(0x5048E0, CFallingGlassPane::CFallingGlassPane, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
+ENDPATCHES