Disable room skipper by default

commandblockguy · Nov 18, 2021 · f412427 · f412427
1 parent 111fc17
commit f412427
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/classic.cpp b/src/classic.cpp
@@ -1282,8 +1282,8 @@ void _update() {
         }
     }
 
-    if(kb_IsDown(kb_KeyYequ)) {
-        next_room();
+    if(has_cheats()) {
+        if(kb_IsDown(kb_KeyYequ) && !is_title()) next_room();
     }
 
     profiler_add(obj_update);

diff --git a/src/emu.cpp b/src/emu.cpp
@@ -31,6 +31,7 @@ static struct {
 
 static int gameFrame = 0;
 static int timerOffset = 0;
+static int cheatState = 0;
 
 const uint8_t mask[] = {
         0, 0, 0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -95,8 +96,11 @@ void update() {
         gfx_SwapDraw();
     }
     profiler_end(total);
+    if(kb_IsDown(kb_KeyGraph)) profiler_print();
+    if(cheatState == 0 && kb_IsDown(kb_KeyPower)) cheatState++;
+    if(cheatState == 1 && kb_IsDown(kb_KeyMath)) cheatState++;
+    if(cheatState == 2 && kb_IsDown(kb_KeySto)) cheatState++;
     do {
-        if(kb_IsDown(kb_KeyGraph)) profiler_print();
         if(kb_IsDown(kb_KeyClear)) return;
     } while(FRAMESKIP && (int)(timerOffset + timer_Get(1)) < 0);
     profiler_tick();
@@ -280,6 +284,10 @@ int max(int a, int b) {
     return a >= b ? a : b;
 }
 
+bool has_cheats() {
+    return cheatState == 3;
+}
+
 int sin_table[TRIG_PRECISION / 4];
 
 void gen_lookups() {

diff --git a/src/emu.h b/src/emu.h
@@ -40,6 +40,8 @@ int rnd(int max);
 int min(int a, int b);
 int max(int a, int b);
 
+bool has_cheats();
+
 void gen_lookups();
 
 #define DEGREES_TO_ANGLE(deg) ((unsigned)((float)(deg) * (1 << (24 - 3)) / 45))