diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-02-17 21:02:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 21:02:58 +0100 |
| commit | 16ea0527dda06b8f844a23b29d3e9615cf9d85da (patch) | |
| tree | 504304d257e44fd379c01600d35841573ed368b4 /src/control/Script.cpp | |
| parent | Merge pull request #327 from Nick007J/master (diff) | |
| parent | CPopulation 1 (diff) | |
| download | re3-16ea0527dda06b8f844a23b29d3e9615cf9d85da.tar re3-16ea0527dda06b8f844a23b29d3e9615cf9d85da.tar.gz re3-16ea0527dda06b8f844a23b29d3e9615cf9d85da.tar.bz2 re3-16ea0527dda06b8f844a23b29d3e9615cf9d85da.tar.lz re3-16ea0527dda06b8f844a23b29d3e9615cf9d85da.tar.xz re3-16ea0527dda06b8f844a23b29d3e9615cf9d85da.tar.zst re3-16ea0527dda06b8f844a23b29d3e9615cf9d85da.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 148b35dc..77698203 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1741,7 +1741,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command) else if (ScriptParams[0] == PEDTYPE_EMERGENCY || ScriptParams[0] == PEDTYPE_FIREMAN) ped = new CEmergencyPed(ScriptParams[1]); else - ped = new CCivilianPed(ScriptParams[0], ScriptParams[1]); + ped = new CCivilianPed((ePedType)ScriptParams[0], ScriptParams[1]); ped->CharCreatedBy = MISSION_CHAR; ped->bRespondsToThreats = false; ped->bAllowMedicsToReviveMe = false; @@ -2780,7 +2780,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command) else if (ScriptParams[1] == PEDTYPE_EMERGENCY || ScriptParams[1] == PEDTYPE_FIREMAN) pPed = new CEmergencyPed(ScriptParams[2]); else - pPed = new CCivilianPed(ScriptParams[1], ScriptParams[2]); + pPed = new CCivilianPed((ePedType)ScriptParams[1], ScriptParams[2]); pPed->CharCreatedBy = MISSION_CHAR; pPed->bRespondsToThreats = false; pPed->bAllowMedicsToReviveMe = false; @@ -3975,7 +3975,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command) else if (ScriptParams[1] == PEDTYPE_EMERGENCY || ScriptParams[1] == PEDTYPE_FIREMAN) pPed = new CEmergencyPed(ScriptParams[2]); else - pPed = new CCivilianPed(ScriptParams[1], ScriptParams[2]); + pPed = new CCivilianPed((ePedType)ScriptParams[1], ScriptParams[2]); pPed->CharCreatedBy = MISSION_CHAR; pPed->bRespondsToThreats = false; pPed->bAllowMedicsToReviveMe = false; @@ -7372,7 +7372,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command) CZoneInfo zoneinfo; CTheZones::GetZoneInfoForTimeOfDay(&CWorld::Players[CWorld::PlayerInFocus].GetPos(), &zoneinfo); int mi; - int pedtype = PEDTYPE_COP; + ePedType pedtype = PEDTYPE_COP; int attempt = 0; while (pedtype != PEDTYPE_CIVMALE && pedtype != PEDTYPE_CIVFEMALE && attempt < 5) { mi = CPopulation::ChooseCivilianOccupation(zoneinfo.pedGroup); |