Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

glass NULL->nil

Browse Source
This commit is contained in:
Fire-Head 2020-04-15 20:09:51 +03:00
parent 708d247c98
commit cb4e1d68e7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/render/Glass.cpp
View File

@ -404,7 +404,7 @@ CGlass::AskForObjectToBeRenderedInGlass(CEntity *entity)
void void
CGlass::RenderEntityInGlass(CEntity *entity) CGlass::RenderEntityInGlass(CEntity *entity)
{ {
ASSERT(entity!=NULL); ASSERT(entity!=nil);
CObject *object = (CObject *)entity; CObject *object = (CObject *)entity;
if ( object->bGlassBroken ) if ( object->bGlassBroken )
@ -420,7 +420,7 @@ CGlass::RenderEntityInGlass(CEntity *entity)
uint8 alpha = CalcAlphaWithNormal(&fwdNorm); uint8 alpha = CalcAlphaWithNormal(&fwdNorm);
CColModel *col = object->GetColModel(); CColModel *col = object->GetColModel();
ASSERT(col!=NULL); ASSERT(col!=nil);
if ( col->numTriangles >= 2 ) if ( col->numTriangles >= 2 )
{ {
CVector a = object->GetMatrix() * col->vertices[0]; CVector a = object->GetMatrix() * col->vertices[0];
@ -524,7 +524,7 @@ CGlass::RenderEntityInGlass(CEntity *entity)
int32 int32
CGlass::CalcAlphaWithNormal(CVector *normal) CGlass::CalcAlphaWithNormal(CVector *normal)
{ {
ASSERT(normal!=NULL); ASSERT(normal!=nil);
float fwdDir = 2.0f * DotProduct(*normal, TheCamera.GetForward()); float fwdDir = 2.0f * DotProduct(*normal, TheCamera.GetForward());
float fwdDot = DotProduct(TheCamera.GetForward()-fwdDir*(*normal), CVector(0.57f, 0.57f, -0.57f)); float fwdDot = DotProduct(TheCamera.GetForward()-fwdDir*(*normal), CVector(0.57f, 0.57f, -0.57f));
@ -600,7 +600,7 @@ CGlass::RenderReflectionPolys(void)
void void
CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed, CVector point, bool explosion) CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed, CVector point, bool explosion)
{ {
ASSERT(entity!=NULL); ASSERT(entity!=nil);
CObject *object = (CObject *)entity; CObject *object = (CObject *)entity;
@ -610,7 +610,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
object->bGlassCracked = true; object->bGlassCracked = true;
CColModel *col = object->GetColModel(); CColModel *col = object->GetColModel();
ASSERT(col!=NULL); ASSERT(col!=nil);
CVector a = object->GetMatrix() * col->vertices[0]; CVector a = object->GetMatrix() * col->vertices[0];
CVector b = object->GetMatrix() * col->vertices[1]; CVector b = object->GetMatrix() * col->vertices[1];
@ -653,7 +653,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
void void
CGlass::WindowRespondsToSoftCollision(CEntity *entity, float amount) CGlass::WindowRespondsToSoftCollision(CEntity *entity, float amount)
{ {
ASSERT(entity!=NULL); ASSERT(entity!=nil);
CObject *object = (CObject *)entity; CObject *object = (CObject *)entity;
@ -667,7 +667,7 @@ CGlass::WindowRespondsToSoftCollision(CEntity *entity, float amount)
void void
CGlass::WasGlassHitByBullet(CEntity *entity, CVector point) CGlass::WasGlassHitByBullet(CEntity *entity, CVector point)
{ {
ASSERT(entity!=NULL); ASSERT(entity!=nil);
CObject *object = (CObject *)entity; CObject *object = (CObject *)entity;
@ -689,7 +689,7 @@ CGlass::WasGlassHitByBullet(CEntity *entity, CVector point)
void void
CGlass::WindowRespondsToExplosion(CEntity *entity, CVector point) CGlass::WindowRespondsToExplosion(CEntity *entity, CVector point)
{ {
ASSERT(entity!=NULL); ASSERT(entity!=nil);
CObject *object = (CObject *)entity; CObject *object = (CObject *)entity;