summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-12-02 00:34:51 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-12-02 00:34:51 +0100
commitfda58fb1dfaba95c72f564d155560abd8d10b794 (patch)
treeea8dbbff0e92086a2badcb495fb82408077a4e39 /src
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-fda58fb1dfaba95c72f564d155560abd8d10b794.tar
re3-fda58fb1dfaba95c72f564d155560abd8d10b794.tar.gz
re3-fda58fb1dfaba95c72f564d155560abd8d10b794.tar.bz2
re3-fda58fb1dfaba95c72f564d155560abd8d10b794.tar.lz
re3-fda58fb1dfaba95c72f564d155560abd8d10b794.tar.xz
re3-fda58fb1dfaba95c72f564d155560abd8d10b794.tar.zst
re3-fda58fb1dfaba95c72f564d155560abd8d10b794.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/SceneEdit.cpp3
-rw-r--r--src/control/SceneEdit.h3
-rw-r--r--src/core/Cam.cpp5
-rw-r--r--src/core/Camera.cpp2
-rw-r--r--src/core/Camera.h2
-rw-r--r--src/core/Game.cpp4
-rw-r--r--src/core/config.h1
-rw-r--r--src/core/main.cpp2
-rw-r--r--src/core/re3.cpp2
9 files changed, 19 insertions, 5 deletions
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 154fe603..8224c1d4 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -1,7 +1,7 @@
#include "common.h"
#include "SceneEdit.h"
-
+#ifdef GTA_SCENE_EDIT
#include "Automobile.h"
#include "Camera.h"
#include "CarCtrl.h"
@@ -1096,3 +1096,4 @@ bool CSceneEdit::SelectWeapon(void)
}
return false;
}
+#endif
diff --git a/src/control/SceneEdit.h b/src/control/SceneEdit.h
index 6dcefa31..7c8fb98a 100644
--- a/src/control/SceneEdit.h
+++ b/src/control/SceneEdit.h
@@ -1,5 +1,5 @@
#pragma once
-
+#ifdef GTA_SCENE_EDIT
class CPed;
class CVehicle;
@@ -93,3 +93,4 @@ public:
static void SelectVehicle(void);
static bool SelectWeapon(void);
};
+#endif
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 0e1c9d9f..3913274a 100644
--- a/src/core/Cam.cpp
+++ b/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)
{
@@ -3935,7 +3938,6 @@ CCam::Process_Editor(const CVector&, float, float, float)
FOV = DefaultFOV;
Alpha += DEGTORAD(CPad::GetPad(1)->GetLeftStickY()) / 50.0f;
Beta += DEGTORAD(CPad::GetPad(1)->GetLeftStickX()*1.5f) / 19.0f;
-
if(CamTargetEntity && CSceneEdit::m_bCameraFollowActor){
TargetCoors = CamTargetEntity->GetPosition();
}else if(CSceneEdit::m_bRecording){
@@ -3997,6 +3999,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)
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 51876c93..f28fb450 100644
--- a/src/core/Camera.cpp
+++ b/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){
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 0797db9b..ca1bd135 100644
--- a/src/core/Camera.h
+++ b/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);
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 6b9fd11f..586b1469 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -525,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
@@ -976,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();
diff --git a/src/core/config.h b/src/core/config.h
index 07e91ee2..ccea1868 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -197,6 +197,7 @@ enum Config {
# define PS2_MATFX
# endif
# define GTA_REPLAY
+# define GTA_SCENE_EDIT
#elif defined GTA_XBOX
#endif
diff --git a/src/core/main.cpp b/src/core/main.cpp
index fa16b6c2..ebfa096a 100644
--- a/src/core/main.cpp
+++ b/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();
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 506b2714..5974175a 100644
--- a/src/core/re3.cpp
+++ b/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