diff options
| author | aap <aap@papnet.eu> | 2020-05-06 12:23:57 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-06 12:23:57 +0200 |
| commit | e0568a19d52e7aebef65960df93a90d0693c7b56 (patch) | |
| tree | b4ec779b2e76f6a2bebf286084d99888f8ad3275 /src/core/User.cpp | |
| parent | updating librw because of fuckup (diff) | |
| download | re3-e0568a19d52e7aebef65960df93a90d0693c7b56.tar re3-e0568a19d52e7aebef65960df93a90d0693c7b56.tar.gz re3-e0568a19d52e7aebef65960df93a90d0693c7b56.tar.bz2 re3-e0568a19d52e7aebef65960df93a90d0693c7b56.tar.lz re3-e0568a19d52e7aebef65960df93a90d0693c7b56.tar.xz re3-e0568a19d52e7aebef65960df93a90d0693c7b56.tar.zst re3-e0568a19d52e7aebef65960df93a90d0693c7b56.zip | |
Diffstat (limited to 'src/core/User.cpp')
| -rw-r--r-- | src/core/User.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/User.cpp b/src/core/User.cpp index 50eb7d9d..716d6393 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::FindSmallestNavigationZoneForPosition(&pos, false, true); + CZone *defaultZone = CTheZones::FindSmallestNavigationZoneForPosition(&pos, true, false); 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 { |