fix bugs

RandomityGuy · Oct 28, 2022 · 2d7a466 · 2d7a466
1 parent f2d2890
commit 2d7a466
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/ts/level.ts b/src/ts/level.ts
@@ -1225,7 +1225,7 @@ export class Level extends Scheduler {
 			else this.rewind.rewindManager.pushFrame(this.rewind.getCurrentFrame(this.deltaMsAccumulator));
 		}
 
-		if (this.rewinding && !playReplay && this.finishTime === null) {
+		if (this.rewinding && !playReplay && !state.menu.finishScreen.showing) {
 			this.rewind.rewindFrame(null);
 			this.updateUI();
 		}
@@ -1617,7 +1617,7 @@ export class Level extends Scheduler {
 				resetPressedFlag('use');
 				resetPressedFlag('jump');
 				resetPressedFlag('restart');
-			});
+			}, 'finishSchedule');
 		}
 	}
 

diff --git a/src/ts/rewind/rewind.ts b/src/ts/rewind/rewind.ts
@@ -335,6 +335,11 @@ export class Rewind {
 		level.checkpointBlast = framedata.checkpointBlast;
 		level.respawnTimes = framedata.respawnTimes;
 
+        if (level.finishTime !== null) {
+            level.finishTime = null;
+            level.clearScheduleId('finishSchedule');
+        }
+
 		marble.body.position.copy(framedata.position);
 		marble.body.orientation.copy(framedata.rotation);
 		marble.body.linearVelocity.copy(framedata.velocity);

diff --git a/src/ts/ui/options_mbp.ts b/src/ts/ui/options_mbp.ts
@@ -145,6 +145,7 @@ export class MbpOptionsScreen extends OptionsScreen {
 		this.addHeading(this.generalContainer, "Rewind");
 		this.addSlider(this.generalContainer, "rewindTimescale", "Timescale", 0.1, 1, undefined, undefined, 0.09, (x) => (Math.ceil(x * 10) / 10).toString(), true);
 		this.addDropdown(this.generalContainer, "rewindMatchFPS", "Match FPS", ["Disabled", "Enabled"], true);
+		this.addHotkey(this.generalContainer, "rewind");
 
 		this.addHeading(this.generalContainer, 'Touch Controls');