summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2019-07-31 17:54:18 +0200
committerFilip Gawin <filip.gawin@zoho.com>2019-08-27 21:13:17 +0200
commitaf5bd951aeb43c341d5126bc4141992169e46d57 (patch)
tree08c819a7c31d30abb6915b21b80239ace256b692 /src/control/Script.cpp
parentMerge pull request #197 from Nick007J/master (diff)
downloadre3-af5bd951aeb43c341d5126bc4141992169e46d57.tar
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.gz
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.bz2
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.lz
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.xz
re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.zst
re3-af5bd951aeb43c341d5126bc4141992169e46d57.zip
Diffstat (limited to '')
-rw-r--r--src/control/Script.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index c81cd050..7e87fc6e 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -1987,7 +1987,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command)
car->AutoPilot.m_nCarMission = MISSION_GOTOCOORDS;
car->m_status = STATUS_PHYSICS;
car->bEngineOn = true;
- car->AutoPilot.m_nCruiseSpeed = max(car->AutoPilot.m_nCruiseSpeed, 6);
+ car->AutoPilot.m_nCruiseSpeed = Max(car->AutoPilot.m_nCruiseSpeed, 6);
car->AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
return 0;
}
@@ -1999,7 +1999,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command)
CCarCtrl::JoinCarWithRoadSystem(car);
car->AutoPilot.m_nCarMission = MISSION_CRUISE;
car->bEngineOn = true;
- car->AutoPilot.m_nCruiseSpeed = max(car->AutoPilot.m_nCruiseSpeed, 6);
+ car->AutoPilot.m_nCruiseSpeed = Max(car->AutoPilot.m_nCruiseSpeed, 6);
car->AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
return 0;
}
@@ -2083,7 +2083,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command)
CollectParameters(&m_nIp, 2);
CVehicle* car = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
assert(car);
- car->AutoPilot.m_nCruiseSpeed = min(*(float*)&ScriptParams[1], 60.0f * car->pHandling->Transmission.fUnkMaxVelocity);
+ car->AutoPilot.m_nCruiseSpeed = Min(*(float*)&ScriptParams[1], 60.0f * car->pHandling->Transmission.fUnkMaxVelocity);
return 0;
}
case COMMAND_SET_CAR_DRIVING_STYLE: