archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-26 20:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with master

Browse Source
This commit is contained in:
Nikolay Korolev
2020-04-19 17:38:48 +03:00
parent 9e65eb34ec 0f07a323c9
commit df376a13ea
28 changed files with 104 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/render/Fluff.cpp
View File

@ -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;
}
}
}

2
src/render/Fluff.h
View File

@ -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;

2
src/render/Particle.h
View File

@ -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
};