leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix undoing of slide moves

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-05 19:50:09 -06:00
parent 9197061096
commit 2b07254d70
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/main.js
View File

@ -807,6 +807,8 @@ class Level {
// Mark an actor as sliding // Mark an actor as sliding
make_slide(actor, mode) { make_slide(actor, mode) {
let current = actor.slide_mode;
this.pending_undo.push(() => actor.slide_mode = current);
actor.slide_mode = mode; actor.slide_mode = mode;
} }
@ -1004,8 +1006,16 @@ class Player extends PrimaryView {
this.undo_button = this.root.querySelector('.controls .control-undo'); this.undo_button = this.root.querySelector('.controls .control-undo');
this.undo_button.addEventListener('click', ev => { this.undo_button.addEventListener('click', ev => {
let player_cell = this.level.player.cell; let player_cell = this.level.player.cell;
while (player_cell === this.level.player.cell && this.level.undo_stack.length > 0) { // Keep undoing until (a) we're on another cell and (b) we're not
// sliding, i.e. we're about to make a conscious move
let moved = false;
while (this.level.undo_stack.length > 0 &&
! (moved && this.level.player.slide_mode === null))
{
this.level.undo(); this.level.undo();
if (player_cell !== this.level.player.cell) {
moved = true;
}
} }
// TODO set back to waiting if we hit the start of the level? but // TODO set back to waiting if we hit the start of the level? but
// the stack trims itself so how do we know that // the stack trims itself so how do we know that