diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-02-22 13:36:22 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-02-22 13:36:22 +0100 |
| commit | a312e1ff81df0f00f528f237d4014bd5b24dae12 (patch) | |
| tree | 910dc04b4158a47cdd3b8f6512db84a17cd010f9 /src/control/Script.cpp | |
| parent | fixes (diff) | |
| parent | Merge pull request #329 from erorcun/erorcun (diff) | |
| download | re3-a312e1ff81df0f00f528f237d4014bd5b24dae12.tar re3-a312e1ff81df0f00f528f237d4014bd5b24dae12.tar.gz re3-a312e1ff81df0f00f528f237d4014bd5b24dae12.tar.bz2 re3-a312e1ff81df0f00f528f237d4014bd5b24dae12.tar.lz re3-a312e1ff81df0f00f528f237d4014bd5b24dae12.tar.xz re3-a312e1ff81df0f00f528f237d4014bd5b24dae12.tar.zst re3-a312e1ff81df0f00f528f237d4014bd5b24dae12.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 d31958f3..5cd2a4d3 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1757,7 +1757,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; @@ -2796,7 +2796,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; @@ -3991,7 +3991,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; @@ -7388,7 +7388,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); |