summaryrefslogtreecommitdiffstats
path: root/src/control/SceneEdit.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-25 15:15:01 +0200
committerGitHub <noreply@github.com>2020-06-25 15:15:01 +0200
commit592a6aef0bb336f1364e6bf38230f3793ec35c4d (patch)
tree3b8df6abb470acc7b9b55d0e8476e1478ba626c0 /src/control/SceneEdit.cpp
parentrename attractor flag to type (diff)
parentCWanted, anim fix, ped objs renaming, remove III beta features (diff)
downloadre3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar
re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.gz
re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.bz2
re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.lz
re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.xz
re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.zst
re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.zip
Diffstat (limited to 'src/control/SceneEdit.cpp')
-rw-r--r--src/control/SceneEdit.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 535f6bec..a7727fde 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -631,7 +631,7 @@ void CSceneEdit::ProcessCommand(void)
SelectActor();
if (m_bActorSelected) {
if (pActors[m_nActor]->bInVehicle) {
- pActors[m_nActor]->SetObjective(OBJECTIVE_LEAVE_VEHICLE);
+ pActors[m_nActor]->SetObjective(OBJECTIVE_LEAVE_CAR);
Movie[m_nNumMovieCommands].m_nCommandId = MOVIE_GET_OUT_CAR;
Movie[m_nNumMovieCommands++].m_nActorId = m_nActor;
}
@@ -695,7 +695,7 @@ void CSceneEdit::ProcessCommand(void)
case MOVIE_WAIT:
SelectActor();
if (m_bActorSelected) {
- pActors[m_nActor]->SetObjective(OBJECTIVE_IDLE);
+ pActors[m_nActor]->SetObjective(OBJECTIVE_WAIT_ON_FOOT);
Movie[m_nNumMovieCommands].m_nCommandId = MOVIE_WAIT;
Movie[m_nNumMovieCommands++].m_nActorId = m_nActor;
}
@@ -876,7 +876,7 @@ void CSceneEdit::PlayBack(void)
case MOVIE_GET_OUT_CAR:
m_nActor = Movie[m_nCurrentMovieCommand].m_nActorId;
if (pActors[m_nActor]->bInVehicle)
- pActors[m_nActor]->SetObjective(OBJECTIVE_LEAVE_VEHICLE);
+ pActors[m_nActor]->SetObjective(OBJECTIVE_LEAVE_CAR);
else
++m_nCurrentMovieCommand;
break;
@@ -895,7 +895,7 @@ void CSceneEdit::PlayBack(void)
break;
case MOVIE_WAIT:
m_nActor = Movie[m_nCurrentMovieCommand].m_nActorId;
- pActors[m_nActor]->SetObjective(OBJECTIVE_IDLE);
+ pActors[m_nActor]->SetObjective(OBJECTIVE_WAIT_ON_FOOT);
++m_nCurrentMovieCommand;
break;
case MOVIE_POSITION_CAMERA: