summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-14 19:09:42 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-14 19:09:42 +0200
commit21a11fd3437f341f280a3a6ba9871abc6b7d6a9a (patch)
treea28fe61b6ff55c678ed091490084024fa374843e /src
parentMerge branch 'master' into game_dev (diff)
downloadre3-21a11fd3437f341f280a3a6ba9871abc6b7d6a9a.tar
re3-21a11fd3437f341f280a3a6ba9871abc6b7d6a9a.tar.gz
re3-21a11fd3437f341f280a3a6ba9871abc6b7d6a9a.tar.bz2
re3-21a11fd3437f341f280a3a6ba9871abc6b7d6a9a.tar.lz
re3-21a11fd3437f341f280a3a6ba9871abc6b7d6a9a.tar.xz
re3-21a11fd3437f341f280a3a6ba9871abc6b7d6a9a.tar.zst
re3-21a11fd3437f341f280a3a6ba9871abc6b7d6a9a.zip
Diffstat (limited to '')
-rw-r--r--src/control/SceneEdit.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 251f093f..306aba14 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -197,6 +197,10 @@ void CSceneEdit::ReInitialise(void)
m_bEditOn = true;
m_bRecording = true;
m_bCommandActive = false;
+#ifdef FIX_BUGS
+ m_bCameraFollowActor = false;
+ TheCamera.Cams[TheCamera.ActiveCam].ResetStatics = true; // not enough...
+#endif
m_nActor = -1;
m_nActor2 = -1;
m_nVehicle = -1;
@@ -691,8 +695,8 @@ void CSceneEdit::ProcessCommand(void)
SelectActor();
if (m_bActorSelected) {
pActors[m_nActor]->SetObjective(OBJECTIVE_IDLE);
- Movie[m_nCurrentMovieCommand].m_nCommandId = MOVIE_WAIT;
- Movie[m_nCurrentMovieCommand++].m_nActorId = m_nActor;
+ Movie[m_nNumMovieCommands].m_nCommandId = MOVIE_WAIT;
+ Movie[m_nNumMovieCommands++].m_nActorId = m_nActor;
}
if (CPad::GetPad(1)->GetCircleJustDown()) {
pActors[m_nActor] = nil;