From 19b21cafcd0e457155c71f339dbccb94aff72d83 Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 7 May 2020 17:53:38 +0200 Subject: CZoneInfo mostly done; not its dependencies --- src/control/Script.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/control/Script.cpp') diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 58222317..86fe412a 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -3089,18 +3089,20 @@ int8 CRunningScript::ProcessCommands300To399(int32 command) case COMMAND_SET_ZONE_CAR_INFO: { char label[12]; + int16 gangDensities[NUM_GANGS]; + int i; + CTheScripts::ReadTextLabelFromScript(&m_nIp, label); m_nIp += KEY_LENGTH_IN_SCRIPT; - CollectParameters(&m_nIp, 16); + CollectParameters(&m_nIp, 12); int zone = CTheZones::FindZoneByLabelAndReturnIndex(label, ZONE_INFO); if (zone < 0) { debug("Couldn't find zone - %s\n", label); return 0; } - CTheZones::SetZoneCarInfo(zone, ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3], - ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8], 0, 0, - ScriptParams[9], ScriptParams[10], ScriptParams[11], ScriptParams[12], - ScriptParams[13], ScriptParams[14], ScriptParams[15]); + for(i = 0; i < NUM_GANGS; i++) + gangDensities[i] = ScriptParams[2+i]; + CTheZones::SetZoneCarInfo(zone, ScriptParams[0], ScriptParams[1], ScriptParams[11], gangDensities); return 0; } /* Not implemented. -- cgit v1.2.3 From f80474f5902a5dc43acc75e57e47fca6cc4b3312 Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 7 May 2020 18:08:17 +0200 Subject: little script change --- src/control/Script.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/control/Script.cpp') diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 86fe412a..49da30b0 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -3160,14 +3160,14 @@ int8 CRunningScript::ProcessCommands300To399(int32 command) char label[12]; CTheScripts::ReadTextLabelFromScript(&m_nIp, label); m_nIp += KEY_LENGTH_IN_SCRIPT; - CollectParameters(&m_nIp, 10); + CollectParameters(&m_nIp, 12); int16 zone = CTheZones::FindZoneByLabelAndReturnIndex(label, ZONE_INFO); if (zone < 0) { debug("Couldn't find zone - %s\n", label); return 0; } CTheZones::SetZonePedInfo(zone, ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3], - ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8], 0, 0, ScriptParams[9]); + ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8], ScriptParams[9], ScriptParams[10], ScriptParams[11]); return 0; } case COMMAND_SET_TIME_SCALE: -- cgit v1.2.3