Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some work on zones

Browse Source
This commit is contained in:
aap
2020-05-06 12:23:26 +02:00
parent edd9301d7f
commit cbfc45b3f7
11 changed files with 90 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/User.cpp
View File

@@ -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 {