a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 20:10:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
# Conflicts:
#	src/control/Script.cpp
#	src/core/FileLoader.cpp
#	src/core/User.cpp
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/entities/Entity.cpp
This commit is contained in:
Sergeanur 2020-05-06 14:10:52 +03:00
parent e0568a19d5 cbfc45b3f7
commit c0488d9ecf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Zones.cpp
View file

@ -325,7 +325,7 @@ CTheZones::PointLiesWithinZone(const CVector *v, CZone *zone)
//--MIAMI: done //--MIAMI: done
eLevelName eLevelName
CTheZones::GetLevelFromPosition(const CVector *v) CTheZones::GetLevelFromPosition(CVector const *v)
{ {
int i; int i;
// char tmp[116]; // char tmp[116];