From 402ecd63052cd3f9c4987d896d6c11e926a6f485 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Wed, 1 Jan 2020 02:55:00 +0300 Subject: fix merge with upstream --- src/control/Script.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/control') diff --git a/src/control/Script.cpp b/src/control/Script.cpp index c08eefe2..2e47b288 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -5294,10 +5294,10 @@ int8 CRunningScript::ProcessCommandsFrom600To699(int32 command) { CollectParameters(&m_nIp, 1); if (ScriptParams[0] != 0){ - CWorld::Players[CWorld::PlayerInFocus].m_nSwitchTaxiTime = CTimer::GetTimeInMilliseconds(); - CWorld::Players[CWorld::PlayerInFocus].m_bSwitchTaxi = true; + CWorld::Players[CWorld::PlayerInFocus].m_nUnusedTaxiTimer = CTimer::GetTimeInMilliseconds(); + CWorld::Players[CWorld::PlayerInFocus].m_bUnusedTaxiThing = true; }else{ - CWorld::Players[CWorld::PlayerInFocus].m_bSwitchTaxi = false; + CWorld::Players[CWorld::PlayerInFocus].m_bUnusedTaxiThing = false; } return 0; } -- cgit v1.2.3