Merge branch 'master' of github.com:GTAmodding/re3

src/core/Cam.cpp

@@ -263,9 +263,11 @@ CCam::Process(void)
 	case MODE_FIGHT_CAM_RUNABOUT:
 		Process_1rstPersonPedOnPC(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
 		break;
+#ifdef GTA_SCENE_EDIT
 	case MODE_EDITOR:
 		Process_Editor(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
 		break;
+#endif
 	default:
 		Source = CVector(0.0f, 0.0f, 0.0f);
 		Front = CVector(0.0f, 1.0f, 0.0f);
@@ -3919,6 +3921,7 @@ CCam::Process_Debug(const CVector&, float, float, float)
 }
 #endif
 
+#ifdef GTA_SCENE_EDIT
 void
 CCam::Process_Editor(const CVector&, float, float, float)
 {
@@ -3997,6 +4000,7 @@ CCam::Process_Editor(const CVector&, float, float, float)
 		sprintf(str, "Look@: %f, Look@: %f, Look@: %f ", Front.x + Source.x, Front.y + Source.y, Front.z + Source.z);
 	}
 }
+#endif
 
 void
 CCam::Process_ModelView(const CVector &CameraTarget, float, float, float)

src/core/Camera.cpp

@@ -1576,8 +1576,10 @@ CCamera::CamControl(void)
 					switchByJumpCut = true;
 			}
 		}
+#ifdef GTA_SCENE_EDIT
 		if(CSceneEdit::m_bEditOn)
 			ReqMode = CCam::MODE_EDITOR;
+#endif
 
 		if((m_uiTransitionState == 0 || switchByJumpCut) && ReqMode != Cams[ActiveCam].Mode){
 			if(switchByJumpCut){

src/core/Camera.h

@@ -213,7 +213,9 @@ public:
 	void PrintMode(void);
 
 	void Process_Debug(const CVector&, float, float, float);
+#ifdef GTA_SCENE_EDIT
 	void Process_Editor(const CVector&, float, float, float);
+#endif
 	void Process_ModelView(const CVector &CameraTarget, float, float, float);
 	void Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, float, float);
 	void Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrientation, float, float);

src/core/Game.cpp

@@ -91,6 +91,9 @@
 #include "screendroplets.h"
 #include "crossplatform.h"
 #include "MemoryHeap.h"
+#ifdef USE_TEXTURE_POOL
+#include "TexturePools.h"
+#endif
 
 eLevelName CGame::currLevel;
 bool CGame::bDemoMode = true;
@@ -522,7 +525,7 @@ bool CGame::Initialise(const char* datFile)
 	CAntennas::Init();
 	CGlass::Init();
 	gPhoneInfo.Initialise();
-#ifndef GTA_PS2		// TODO: define for this
+#ifdef GTA_SCENE_EDIT
 	CSceneEdit::Initialise();
 #endif
 
@@ -578,9 +581,7 @@ bool CGame::Initialise(const char* datFile)
 	CPlane::InitPlanes();
 	CCredits::Init();
 	CRecordDataForChase::Init();
-#ifndef GTA_PS2		// TODO: define for that
 	CReplay::Init();
-#endif
 
 #ifdef PS2_MENU
 	if ( !TheMemoryCard.m_bWantToLoad )
@@ -770,10 +771,8 @@ void CGame::ReloadIPLs(void)
 
 void CGame::ShutDownForRestart(void)
 {
-#ifndef GTA_PS2		// TODO: right define
 	CReplay::FinishPlayback();
 	CReplay::EmptyReplayBuffer();
-#endif
 	DMAudio.DestroyAllGameCreatedEntities();
 	
 	for (int i = 0; i < NUMPLAYERS; i++)
@@ -977,7 +976,7 @@ void CGame::Process(void)
 		CSkidmarks::Update();
 		CAntennas::Update();
 		CGlass::Update();
-#ifndef GTA_PS2		// TODO: define
+#ifdef GTA_SCENE_EDIT
 		CSceneEdit::Update();
 #endif
 		CEventList::Update();
@@ -993,9 +992,7 @@ void CGame::Process(void)
 		CMovingThings::Update();
 		CWaterCannons::Update();
 		CUserDisplay::Process();
-#ifndef GTA_PS2		// TODO: define
 		CReplay::Update();
-#endif
 
 		PUSH_MEMID(MEMID_WORLD);
 		CWorld::Process();
@@ -1008,14 +1005,10 @@ void CGame::Process(void)
 		CRubbish::Update();
 		CSpecialFX::Update();
 		CTimeCycle::Update();
-#ifndef GTA_PS2		// TODO: define
 		if (CReplay::ShouldStandardCameraBeProcessed())
-#endif
 			TheCamera.Process();
 		CCullZones::Update();
-#ifndef GTA_PS2		// TODO: define
 		if (!CReplay::IsPlayingBack())
-#endif
 			CGameLogic::Update();
 		CBridge::Update();
 		CCoronas::DoSunAndMoon();
@@ -1023,9 +1016,7 @@ void CGame::Process(void)
 		CShadows::UpdateStaticShadows();
 		CShadows::UpdatePermanentShadows();
 		gPhoneInfo.Update();
-#ifndef GTA_PS2		// TODO: define
 		if (!CReplay::IsPlayingBack())
-#endif
 		{
 			PUSH_MEMID(MEMID_CARS);
 			CCarCtrl::GenerateRandomCars();

src/core/config.h

@@ -196,6 +196,8 @@ enum Config {
 #		define RANDOMSPLASH	// use random splash as on PS2
 #		define PS2_MATFX
 #	endif
+#	define GTA_REPLAY
+#	define GTA_SCENE_EDIT
 #elif defined GTA_XBOX
 #endif
 

src/core/main.cpp

@@ -1160,9 +1160,11 @@ Render2dStuff(void)
 
 	MusicManager.DisplayRadioStationName();
 	TheConsole.Display();
+#ifdef GTA_SCENE_EDIT
 	if(CSceneEdit::m_bEditOn)
 		CSceneEdit::Draw();
 	else
+#endif
 		CHud::Draw();
 	CUserDisplay::OnscnTimer.ProcessForDisplay();
 	CMessages::Display();

src/core/re3.cpp

@@ -580,7 +580,9 @@ DebugMenuPopulate(void)
 		DebugMenuAddVarBool8("Debug", "Disable zone cull", &gbDisableZoneCull, nil);
 
 		DebugMenuAddVarBool8("Debug", "pad 1 -> pad 2", &CPad::m_bMapPadOneToPadTwo, nil);
+#ifdef GTA_SCENE_EDIT
 		DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
+#endif
 #ifdef MENU_MAP
 		DebugMenuAddCmd("Debug", "Teleport to map waypoint", TeleportToWaypoint);
 #endif