summaryrefslogtreecommitdiffstats
path: root/src/core/User.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-06 12:23:26 +0200
committeraap <aap@papnet.eu>2020-05-06 12:23:26 +0200
commitcbfc45b3f72468e7880bec852773955d3886b5ff (patch)
treeb1c472a41e7b50d1950e37c8d27d1eb9531ca57d /src/core/User.cpp
parentreverting fuckup (diff)
downloadre3-cbfc45b3f72468e7880bec852773955d3886b5ff.tar
re3-cbfc45b3f72468e7880bec852773955d3886b5ff.tar.gz
re3-cbfc45b3f72468e7880bec852773955d3886b5ff.tar.bz2
re3-cbfc45b3f72468e7880bec852773955d3886b5ff.tar.lz
re3-cbfc45b3f72468e7880bec852773955d3886b5ff.tar.xz
re3-cbfc45b3f72468e7880bec852773955d3886b5ff.tar.zst
re3-cbfc45b3f72468e7880bec852773955d3886b5ff.zip
Diffstat (limited to 'src/core/User.cpp')
-rw-r--r--src/core/User.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/User.cpp b/src/core/User.cpp
index 50eb7d9d..f906ae44 100644
--- a/src/core/User.cpp
+++ b/src/core/User.cpp
@@ -32,15 +32,15 @@ void
CPlaceName::Process()
{
CVector pos = CWorld::Players[CWorld::PlayerInFocus].GetPos();
- CZone *navigZone = CTheZones::FindSmallestZonePositionType(&pos, ZONE_TYPE1);
- CZone *audioZone = CTheZones::FindSmallestZonePositionType(&pos, ZONE_AUDIO);
+ CZone *navigZone = CTheZones::FindSmallestZonePositionType(&pos, ZONE_NAVIG);
+ CZone *defaultZone = CTheZones::FindSmallestZonePositionType(&pos, ZONE_DEFAULT);
if (navigZone == nil) m_pZone = nil;
- if (audioZone == nil) m_pZone2 = nil;
+ if (defaultZone == nil) m_pZone2 = nil;
if (navigZone == m_pZone) {
- if (audioZone == m_pZone2 || m_pZone != nil) {
- if (navigZone != nil || audioZone != nil) {
+ if (defaultZone == m_pZone2 || m_pZone != nil) {
+ if (navigZone != nil || defaultZone != nil) {
if (m_nAdditionalTimer != 0)
m_nAdditionalTimer--;
} else {
@@ -49,7 +49,7 @@ CPlaceName::Process()
m_pZone2 = nil;
}
} else {
- m_pZone2 = audioZone;
+ m_pZone2 = defaultZone;
m_nAdditionalTimer = 250;
}
} else {