summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-04-19 06:14:13 +0200
committereray orçunus <erayorcunus@gmail.com>2020-04-19 15:44:35 +0200
commit1ffc37735ed247eef1f20997a0136ef8d866ebad (patch)
treea6a4689c7aeed054e397c305333f761d0d4acdd1 /src/render
parentslider fix (diff)
downloadre3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.gz
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.bz2
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.lz
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.xz
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.tar.zst
re3-1ffc37735ed247eef1f20997a0136ef8d866ebad.zip
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Fluff.cpp12
-rw-r--r--src/render/Fluff.h2
-rw-r--r--src/render/Particle.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index e068747e..9f3f6929 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -159,12 +159,12 @@ void CMovingThings::Update()
int block = CTimer::GetFrameCounter() % TIME_SPAN;
for (i = (block * NUMMOVINGTHINGS) / TIME_SPAN; i < ((block + 1) * NUMMOVINGTHINGS) / TIME_SPAN; i++) {
- if (aMovingThings[i].field_A == 1)
+ if (aMovingThings[i].m_nHidden == 1)
aMovingThings[i].Update();
}
for (i = 0; i < CMovingThings::Num; i++) {
- if (aMovingThings[i].field_A == 0)
+ if (aMovingThings[i].m_nHidden == 0)
aMovingThings[i].Update();
}
@@ -212,14 +212,14 @@ void CMovingThing::Update()
m_pEntity->UpdateRwFrame();
if (SQR(m_pEntity->GetPosition().x - TheCamera.GetPosition().x) + SQR(m_pEntity->GetPosition().y - TheCamera.GetPosition().y) < 40000.0f) {
- if (field_A == 1) {
+ if (m_nHidden == 1) {
AddToList(&CMovingThings::StartCloseList);
- field_A = 0;
+ m_nHidden = 0;
}
} else {
- if (field_A == 0) {
+ if (m_nHidden == 0) {
RemoveFromList();
- field_A = 1;
+ m_nHidden = 1;
}
}
}
diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index 7ab2d81d..fe3ab256 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -8,7 +8,7 @@ public:
CMovingThing *m_pNext;
CMovingThing *m_pPrev;
int16 m_nType;
- int16 field_A;
+ int16 m_nHidden;
CVector m_vecPosn;
CEntity* m_pEntity;
diff --git a/src/render/Particle.h b/src/render/Particle.h
index b51be6a5..8999f4f6 100644
--- a/src/render/Particle.h
+++ b/src/render/Particle.h
@@ -90,7 +90,7 @@ public:
static void AddJetExplosion(CVector const &vecPos, float fPower, float fSize);
static void AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatrix);
-#ifndef MASTER
+#ifdef TOGGLEABLE_BETA_FEATURES
static bool bEnableBannedParticles;
#endif
};