mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-13 19:04:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into miami

Browse source 
# Conflicts:
#	src/control/RoadBlocks.cpp
#	src/core/Collision.h
#	src/core/Pad.cpp
#	src/core/SurfaceTable.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/peds/Population.cpp
#	src/render/Fluff.cpp
#	src/render/Shadows.cpp
#	src/render/Shadows.h
#	src/render/Sprite2d.cpp
#	src/weapons/BulletInfo.cpp
This commit is contained in:
Sergeanur 2020-08-07 12:34:41 +03:00
commit 7d8ffa9ebd
34 changed files with 3423 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/Zones.cpp
View file

@ -7,6 +7,7 @@
#include "Clock.h"
#include "Text.h"
#include "World.h"
#include "Timer.h"
eLevelName CTheZones::m_CurrLevel;
int16 CTheZones::FindIndex;
@ -127,6 +128,10 @@ CTheZones::Init(void)
void
CTheZones::Update(void)
{
#ifdef SQUEEZE_PERFORMANCE
if (CTimer::GetFrameCounter() % 5 != 0)
return;
#endif
CVector pos;
pos = FindPlayerCoors();
m_CurrLevel = GetLevelFromPosition(&pos);