From 03c90b7c4028d0db1e6eddf6c63c0842c136517a Mon Sep 17 00:00:00 2001
From: majestic <majesticcoding@gmail.com>
Date: Wed, 19 Aug 2020 11:11:19 -0700
Subject: stable CScriptPaths

---
 src/control/Replay.cpp |  5 ++++-
 src/control/Script.cpp | 23 +++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'src/control')

diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 1a050bee..80c05f31 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -39,6 +39,7 @@
 #include "Text.h"
 #include "Camera.h"
 #include "Radar.h"
+#include "Fluff.h"
 
 uint8 CReplay::Mode;
 CAddressInReplayBuffer CReplay::Record;
@@ -229,7 +230,7 @@ void CReplay::EnableReplays(void)
 void PlayReplayFromHD(void);
 void CReplay::Update(void)
 {
-	if (CCutsceneMgr::IsCutsceneProcessing() || CTimer::GetIsPaused())
+	if (CCutsceneMgr::IsCutsceneProcessing() || CTimer::GetIsPaused() || CScriptPaths::IsOneActive()) 
 		return;
 	switch (Mode){
 	case MODE_RECORD:
@@ -1175,6 +1176,7 @@ void CReplay::StoreStuffInMem(void)
 		if (ped)
 			StoreDetailedPedAnimation(ped, &pPedAnims[i]);
 	}
+	CScriptPaths::Save_ForReplay();
 }
 
 void CReplay::RestoreStuffFromMem(void)
@@ -1351,6 +1353,7 @@ void CReplay::RestoreStuffFromMem(void)
 	}
 	delete[] pPedAnims;
 	pPedAnims = nil;
+	CScriptPaths::Load_ForReplay();
 	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
 	DMAudio.SetRadioInCar(OldRadioStation);
 	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index e470cad2..3b0e2201 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -82,6 +82,7 @@
 #include "main.h"
 #include "Ropes.h"
 #include "MBlur.h"
+#include "Fluff.h"
 #ifdef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
 #include <stdarg.h>
 #endif
@@ -12046,36 +12047,42 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	//case COMMAND_IS_PLAYER_STANDING_ON_A_VEHICLE:
 	//case COMMAND_IS_PLAYER_FOOT_DOWN:
 	//case COMMAND_IS_CHAR_FOOT_DOWN:
-	case COMMAND_INITIALISE_OBJECT_PATH:
-		// TODO(MIAMI): script path
+	case COMMAND_INITIALISE_OBJECT_PATH: {
 		CollectParameters(&m_nIp, 2);
-		debug("INITALISE_OBJECT_PATH not yet implemented, skipping\n");
-		ScriptParams[0] = 0;
+		int32 counter = 0;
+		while (counter < 3 && CScriptPaths::aArray[counter].m_state != SCRIPT_PATH_DISABLED) {
+			counter++;
+		}
+		CScriptPaths::aArray[counter].InitialiseOne(ScriptParams[0], *(float*)&ScriptParams[1]);
+		ScriptParams[0] = counter;
 		StoreParameters(&m_nIp, 1);
 		return 0;
+	}
 	case COMMAND_START_OBJECT_ON_PATH:
 	{
 		CollectParameters(&m_nIp, 2);
-		debug("START_OBJECT_ON_PATH not yet implemented, skipping\n");
+		CObject *pObj = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObj);
+		CScriptPaths::aArray[ScriptParams[1]].SetObjectToControl(pObj);
 		return 0;
 	}
 	case COMMAND_SET_OBJECT_PATH_SPEED:
 	{
 		CollectParameters(&m_nIp, 2);
-		debug("SET_OBJECT_PATH_SPEED not yet implemented, skipping\n");
+		CScriptPaths::aArray[ScriptParams[0]].m_fSpeed = *(float*)&ScriptParams[1];
 		return 0;
 	}
 	case COMMAND_SET_OBJECT_PATH_POSITION:
 	{
 		CollectParameters(&m_nIp, 2);
-		debug("SET_OBJECT_PATH_POSITION not yet implemented, skipping\n");
+		CScriptPaths::aArray[ScriptParams[0]].m_fPosition = *(float*)&ScriptParams[1];
 		return 0;
 	}
 	//case COMMAND_GET_OBJECT_DISTANCE_ALONG_PATH:
 	case COMMAND_CLEAR_OBJECT_PATH:
 	{
 		CollectParameters(&m_nIp, 1);
-		debug("CLEAR_OBJECT_PATH not yet implemented, skipping\n");
+		CScriptPaths::aArray[ScriptParams[0]].Clear();
 		return 0;
 	}
 	case COMMAND_HELI_GOTO_COORDS:
-- 
cgit v1.2.3