Merge pull request #429 from Nick007J/master

Scene edit

src/control/SceneEdit.h

@@ -1,14 +1,95 @@
 #pragma once
 
+class CPed;
+class CVehicle;
+
+struct CMovieCommand
+{
+	int32 m_nCommandId;
+	CVector m_vecPosition;
+	CVector m_vecCamera;
+	int16 m_nActorId;
+	int16 m_nActor2Id;
+	int16 m_nVehicleId;
+	int16 m_nModelIndex;
+};
+
 class CSceneEdit
 {
 public:
-	static bool &m_bEditOn;
+	enum {
-	static int32 &m_bCameraFollowActor;
+		MOVIE_DO_NOTHING = 0,
-	static bool &m_bRecording;
+		MOVIE_NEW_ACTOR,
-	static CVector &m_vecCurrentPosition;
+		MOVIE_MOVE_ACTOR,
-	static CVector &m_vecCamHeading;
+		MOVIE_SELECT_ACTOR,
+		MOVIE_DELETE_ACTOR,
+		MOVIE_NEW_VEHICLE,
+		MOVIE_MOVE_VEHICLE,
+		MOVIE_SELECT_VEHICLE,
+		MOVIE_DELETE_VEHICLE,
+		MOVIE_GIVE_WEAPON,
+		MOVIE_GOTO,
+		MOVIE_GOTO_WAIT,
+		MOVIE_GET_IN_CAR,
+		MOVIE_GET_OUT_CAR,
+		MOVIE_KILL,
+		MOVIE_FLEE,
+		MOVIE_WAIT,
+		MOVIE_POSITION_CAMERA,
+		MOVIE_SET_CAMERA_TARGET,
+		MOVIE_SELECT_CAMERA_MODE,
+		MOVIE_SAVE_MOVIE,
+		MOVIE_LOAD_MOVIE,
+		MOVIE_PLAY_MOVIE,
+		MOVIE_END,
+		MOVIE_TOTAL_COMMANDS
+	};
+	enum {
+		NUM_ACTORS_IN_MOVIE = 5,
+		NUM_VEHICLES_IN_MOVIE = 5,
+		NUM_COMMANDS_IN_MOVIE = 20
+	};
+	static int32 m_bCameraFollowActor;
+	static CVector m_vecCurrentPosition;
+	static CVector m_vecCamHeading;
+	static CVector m_vecGotoPosition;
+	static int32 m_nVehicle;
+	static int32 m_nVehicle2;
+	static int32 m_nActor;
+	static int32 m_nActor2;
+	static int32 m_nVehiclemodelId;
+	static int32 m_nPedmodelId;
+	static int16 m_nCurrentMovieCommand;
+	static int16 m_nCurrentCommand;
+	static int16 m_nCurrentVehicle;
+	static int16 m_nCurrentActor;
+	static bool m_bEditOn;
+	static bool m_bRecording;
+	static bool m_bCommandActive;
+	static bool m_bActorSelected;
+	static bool m_bActor2Selected;
+	static bool m_bVehicleSelected;
+	static int16 m_nNumActors;
+	static int16 m_nNumVehicles;
+	static int16 m_nNumMovieCommands;
+	static int16 m_nWeaponType;
+	static CPed* pActors[NUM_ACTORS_IN_MOVIE];
+	static CVehicle* pVehicles[NUM_VEHICLES_IN_MOVIE];
+	static bool m_bDrawGotoArrow;
+	static CMovieCommand Movie[NUM_COMMANDS_IN_MOVIE];
 
+	static void LoadMovie(void);
+	static void SaveMovie(void);
+	static void Initialise(void);
+	static void InitPlayback(void);
+	static void ReInitialise(void);
 	static void Update(void);
-	static void Init(void);
+	static void Draw(void);
+	static void ProcessCommand(void);
+	static void PlayBack(void);
+	static void ClearForNewCommand(void);
+	static void SelectActor(void);
+	static void SelectActor2(void);
+	static void SelectVehicle(void);
+	static bool SelectWeapon(void);
 };

src/core/Game.cpp

@@ -350,7 +350,7 @@ bool CGame::Initialise(const char* datFile)
 	CAntennas::Init();
 	CGlass::Init();
 	gPhoneInfo.Initialise();
-	CSceneEdit::Init();
+	CSceneEdit::Initialise();
 	LoadingScreen("Loading the Game", "Load scripts", nil);
 	CTheScripts::Init();
 	CGangs::Initialise();

src/core/main.cpp

@@ -58,6 +58,7 @@
 #include "Console.h"
 #include "timebars.h"
 #include "GenericGameStorage.h"
+#include "SceneEdit.h"
 
 GlobalScene &Scene = *(GlobalScene*)0x726768;
 
@@ -864,11 +865,9 @@ Render2dStuff(void)
 
 	MusicManager.DisplayRadioStationName();
 	TheConsole.Display();
-/*
 	if(CSceneEdit::m_bEditOn)
 		CSceneEdit::Draw();
 	else
-*/
 		CHud::Draw();
 	CUserDisplay::OnscnTimer.ProcessForDisplay();
 	CMessages::Display();

src/core/re3.cpp

@@ -22,6 +22,8 @@
 #include "Console.h"
 #include "Debug.h"
 #include "Hud.h"
+#include "SceneEdit.h"
+#include "Pad.h"
 
 #include <list>
 
@@ -332,6 +334,7 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Spawn", "Spawn Predator", [](){ SpawnCar(MI_PREDATOR); });
 
 		DebugMenuAddVarBool8("Debug", "Draw hud", (int8*)&CHud::m_Wants_To_Draw_Hud, nil);
+		DebugMenuAddVarBool8("Debug", "Edit on", (int8*)&CSceneEdit::m_bEditOn, nil);
 		DebugMenuAddVar("Debug", "Engine Status", &engineStatus, nil, 1, 0, 226, nil);
 		DebugMenuAddCmd("Debug", "Set Engine Status", SetEngineStatus);
 		DebugMenuAddCmd("Debug", "Fix Car", FixCar);