summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2020-04-15 19:09:51 +0200
committerFire-Head <Fire-Head@users.noreply.github.com>2020-04-15 19:09:51 +0200
commitcb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d (patch)
tree8e760f5129c2740c93dac0b59f819c2a1403b53a /src
parent'fix' fix (diff)
downloadre3-cb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d.tar
re3-cb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d.tar.gz
re3-cb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d.tar.bz2
re3-cb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d.tar.lz
re3-cb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d.tar.xz
re3-cb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d.tar.zst
re3-cb4e1d68e77a7fd7f17563d0522eeb2f0c39e94d.zip
Diffstat (limited to 'src')
-rw-r--r--src/render/Glass.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp
index 46a12a6f..ac6c1728 100644
--- a/src/render/Glass.cpp
+++ b/src/render/Glass.cpp
@@ -404,7 +404,7 @@ CGlass::AskForObjectToBeRenderedInGlass(CEntity *entity)
void
CGlass::RenderEntityInGlass(CEntity *entity)
{
- ASSERT(entity!=NULL);
+ ASSERT(entity!=nil);
CObject *object = (CObject *)entity;
if ( object->bGlassBroken )
@@ -420,7 +420,7 @@ CGlass::RenderEntityInGlass(CEntity *entity)
uint8 alpha = CalcAlphaWithNormal(&fwdNorm);
CColModel *col = object->GetColModel();
- ASSERT(col!=NULL);
+ ASSERT(col!=nil);
if ( col->numTriangles >= 2 )
{
CVector a = object->GetMatrix() * col->vertices[0];
@@ -524,7 +524,7 @@ CGlass::RenderEntityInGlass(CEntity *entity)
int32
CGlass::CalcAlphaWithNormal(CVector *normal)
{
- ASSERT(normal!=NULL);
+ ASSERT(normal!=nil);
float fwdDir = 2.0f * DotProduct(*normal, TheCamera.GetForward());
float fwdDot = DotProduct(TheCamera.GetForward()-fwdDir*(*normal), CVector(0.57f, 0.57f, -0.57f));
@@ -600,7 +600,7 @@ CGlass::RenderReflectionPolys(void)
void
CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed, CVector point, bool explosion)
{
- ASSERT(entity!=NULL);
+ ASSERT(entity!=nil);
CObject *object = (CObject *)entity;
@@ -610,7 +610,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
object->bGlassCracked = true;
CColModel *col = object->GetColModel();
- ASSERT(col!=NULL);
+ ASSERT(col!=nil);
CVector a = object->GetMatrix() * col->vertices[0];
CVector b = object->GetMatrix() * col->vertices[1];
@@ -653,7 +653,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
void
CGlass::WindowRespondsToSoftCollision(CEntity *entity, float amount)
{
- ASSERT(entity!=NULL);
+ ASSERT(entity!=nil);
CObject *object = (CObject *)entity;
@@ -667,7 +667,7 @@ CGlass::WindowRespondsToSoftCollision(CEntity *entity, float amount)
void
CGlass::WasGlassHitByBullet(CEntity *entity, CVector point)
{
- ASSERT(entity!=NULL);
+ ASSERT(entity!=nil);
CObject *object = (CObject *)entity;
@@ -689,7 +689,7 @@ CGlass::WasGlassHitByBullet(CEntity *entity, CVector point)
void
CGlass::WindowRespondsToExplosion(CEntity *entity, CVector point)
{
- ASSERT(entity!=NULL);
+ ASSERT(entity!=nil);
CObject *object = (CObject *)entity;