Merge pull request #345 from icosahedral-dragon/demo-support

Demo support
Interrupt · Jan 8, 2020 · 06d882e · 06d882e
2 parents d505761 + 0a191b9
commit 06d882e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/GameSrc/Headers/setploop.h b/src/GameSrc/Headers/setploop.h
@@ -57,18 +57,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SETUP_ANIM_UPDATE LL_CHG_BASE << 0
 
 // loop id's
-#define SETUP_ANIM       0
-#define SETUP_JOURNEY    1
-#define SETUP_DIFFICULTY 2
-#define SETUP_CREDITS    3
-#define SETUP_CONTINUE   4
+typedef enum {
+    SETUP_JOURNEY,
+    SETUP_DIFFICULTY,
+    SETUP_CREDITS,
+    SETUP_CONTINUE
+} SetupMode;
 
 // Prototypes
 void setup_loop(void);
 void journey_credits_done(void);
 errtype journey_credits_func(uchar draw_stuff);
 
 // Globals
-extern int setup_mode;
+extern SetupMode setup_mode;
 
 #endif // __SETPLOOP_H
diff --git a/src/GameSrc/cutsloop.c b/src/GameSrc/cutsloop.c
@@ -275,7 +275,12 @@ short play_cutscene(int id, bool show_credits)
   MacTuneKillCurrentTheme();
 
   cutscene_filehandle = ResOpenFile(cutscene_files[id]);
-  if (cutscene_filehandle <= 0) return 0;
+  if (cutscene_filehandle <= 0) {
+      // If we failed to play the cutscene, go to setup / credits.
+      _new_mode = SETUP_LOOP;
+      chg_set_flg(GL_CHG_LOOP);
+      return 0;
+  }
 
   INFO("Playing Cutscene %i", id);
 

diff --git a/src/GameSrc/setup.c b/src/GameSrc/setup.c
@@ -103,8 +103,8 @@ uiSlab setup_slab;
 LGRegion setup_root_region;
 uchar play_intro_anim;
 uchar save_game_exists = FALSE;
-int setup_mode;
-int last_setup_mode;
+SetupMode setup_mode;
+SetupMode last_setup_mode;
 int intro_num;
 int splash_num;
 int diff_sum = 0;
@@ -1516,7 +1516,6 @@ void setup_loop(void)
     case SETUP_DIFFICULTY: difficulty_draw(draw_stuff); break;
     case SETUP_JOURNEY:    journey_draw(draw_stuff); break;
     case SETUP_CONTINUE:   journey_continue_func(draw_stuff); break;
-    case SETUP_ANIM:       break; // FIXME: What should this do?
     case SETUP_CREDITS:    journey_credits_func(draw_stuff); break;
   }
 }
@@ -1585,13 +1584,12 @@ void setup_start(void)
     if (!save_game_exists && start_first_time)
     {
       play_intro_anim = TRUE;
-      setup_mode = SETUP_ANIM;
     }
     else
     {
       play_intro_anim = FALSE;
-      setup_mode = SETUP_JOURNEY;
     }
+    setup_mode = SETUP_JOURNEY;
   }
 
   if (!start_first_time) closedown_game(TRUE);