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

Use NUMROADBLOCKS enum member in CRoadBlocks

Browse Source
This commit is contained in:
saml1er 2020-04-14 02:13:00 +05:00
parent 68f8a6a9ed
commit 60eb60de4e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/control/RoadBlocks.cpp
View File

@ -25,7 +25,7 @@ CRoadBlocks::Init(void)
NumRoadBlocks = 0; NumRoadBlocks = 0;
for (int objId = 0; objId < ThePaths.m_numMapObjects; objId++) { for (int objId = 0; objId < ThePaths.m_numMapObjects; objId++) {
if (ThePaths.m_objectFlags[objId] & UseInRoadBlock) { if (ThePaths.m_objectFlags[objId] & UseInRoadBlock) {
if (NumRoadBlocks < 600) { if (NumRoadBlocks < NUMROADBLOCKS) {
InOrOut[NumRoadBlocks] = true; InOrOut[NumRoadBlocks] = true;
RoadBlockObjects[NumRoadBlocks] = objId; RoadBlockObjects[NumRoadBlocks] = objId;
NumRoadBlocks++; NumRoadBlocks++;
@ -105,8 +105,8 @@ CRoadBlocks::GenerateRoadBlocks(void)
{ {
CMatrix offsetMatrix; CMatrix offsetMatrix;
uint32 frame = CTimer::GetFrameCounter() & 0xF; uint32 frame = CTimer::GetFrameCounter() & 0xF;
int16 nRoadblockNode = (int16)(600 * frame) / 16; int16 nRoadblockNode = (int16)(NUMROADBLOCKS * frame) / 16;
const int16 maxRoadBlocks = (int16)(600 * (frame + 1)) / 16; const int16 maxRoadBlocks = (int16)(NUMROADBLOCKS * (frame + 1)) / 16;
int16 numRoadBlocks = CRoadBlocks::NumRoadBlocks; int16 numRoadBlocks = CRoadBlocks::NumRoadBlocks;
if (CRoadBlocks::NumRoadBlocks >= maxRoadBlocks) if (CRoadBlocks::NumRoadBlocks >= maxRoadBlocks)
numRoadBlocks = maxRoadBlocks; numRoadBlocks = maxRoadBlocks;