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:
Sergeanur 2020-05-06 14:10:52 +03:00
commit c0488d9ecf

View File

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