fix messged up FMV sequence IDs (closes #41)

LostArtefacts · Mar 4, 2021 · a0bec82 · a0bec82
1 parent 5f17175
commit a0bec82
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/game/control.c b/src/game/control.c
@@ -32,8 +32,9 @@ int32_t ControlPhase(int32_t nframes, int32_t demo_mode)
     }
 
     for (; FrameCount >= 0; FrameCount -= 0x10000) {
-        if (CDTrack > 0)
+        if (CDTrack > 0) {
             S_CDLoop();
+        }
 
         CheckCheatMode();
         if (LevelComplete) {

diff --git a/src/game/game.c b/src/game/game.c
@@ -168,12 +168,12 @@ int32_t LevelCompleteSequence(int level_num)
         return GF_STARTCINE | LV_CUTSCENE3;
 
     case LV_LEVEL10B:
-        S_PlayFMV(FMV_ENDSEQ, 1);
+        S_PlayFMV(FMV_PRISON, 1);
         return GF_STARTCINE | LV_CUTSCENE4;
 
     case LV_LEVEL10C:
         LevelStats(LV_LEVEL10C);
-        S_PlayFMV(FMV_CORE, 1);
+        S_PlayFMV(FMV_ENDSEQ, 1);
         TempVideoAdjust(2, 1.0);
         S_DisplayPicture("data\\end");
         sub_408E41();

diff --git a/src/game/types.h b/src/game/types.h
@@ -687,14 +687,14 @@ typedef enum {
     FMV_GYM = 1,
     FMV_SNOW = 2,
     FMV_LIFT = 3,
-    FMV_VISION = 3,
-    FMV_CANYON = 4,
-    FMV_PYRAMID = 5,
-    FMV_PRISON = 6,
-    FMV_ENDSEQ = 7,
-    FMV_CORE = 8,
-    FMV_ESCAPE = 9,
-    NUMBER_OF_FMV
+    FMV_VISION = 4,
+    FMV_CANYON = 5,
+    FMV_PYRAMID = 6,
+    FMV_PRISON = 7,
+    FMV_ENDSEQ = 8,
+    FMV_CORE = 9,
+    FMV_ESCAPE = 10,
+    NUMBER_OF_FMV = 11,
 } FMV_SEQUENCE;
 
 typedef enum {