mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 16:30:01 +00:00
Merge remote-tracking branch 'origin/master' into miami
# 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:
commit
c0488d9ecf
|
@ -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];
|
||||||
|
|
Loading…
Reference in a new issue