Merge 9f7c0ca40a into 816b249f67
This commit is contained in:
commit
efef740362
18
js/main.js
18
js/main.js
@ -916,9 +916,16 @@ class Player extends PrimaryView {
|
|||||||
};
|
};
|
||||||
touch_target.addEventListener('touchend', dismiss_touches);
|
touch_target.addEventListener('touchend', dismiss_touches);
|
||||||
touch_target.addEventListener('touchcancel', dismiss_touches);
|
touch_target.addEventListener('touchcancel', dismiss_touches);
|
||||||
// Also grab taps on the overlay, for the specific case that tapping on the end of level
|
// Also grab taps on the overlay, for the specific cases that tapping on the end of level
|
||||||
// tally advances to the next level
|
// tally advances to the next level, and tapping on a non-phone dismisses the overlay
|
||||||
this.overlay_message_el.addEventListener('touchstart', ev => {
|
this.overlay_message_el.addEventListener('touchstart', ev => {
|
||||||
|
if (this.state === 'waiting' || this.state === 'paused') {
|
||||||
|
if (getComputedStyle(this.mobile_pause_menu).display === 'none') {
|
||||||
|
this.set_state('playing');
|
||||||
|
ev.stopPropagation();
|
||||||
|
ev.preventDefault();
|
||||||
|
}
|
||||||
|
}
|
||||||
if (this.state === 'stopped') {
|
if (this.state === 'stopped') {
|
||||||
if (this.touch_restart_delay.active) {
|
if (this.touch_restart_delay.active) {
|
||||||
// If it's only been a very short time since the level ended, ignore taps
|
// If it's only been a very short time since the level ended, ignore taps
|
||||||
@ -1982,8 +1989,13 @@ class Player extends PrimaryView {
|
|||||||
mk('h2', `#${stored_level.number} ${stored_level.title}`),
|
mk('h2', `#${stored_level.number} ${stored_level.title}`),
|
||||||
mk('h3', stored_level.author ? `by ${stored_level.author}` : "\u200b"),
|
mk('h3', stored_level.author ? `by ${stored_level.author}` : "\u200b"),
|
||||||
this.mobile_pause_menu,
|
this.mobile_pause_menu,
|
||||||
mk('p.-controls-hint', "WASD/↑←↓→ to move · space to start without moving"),
|
|
||||||
);
|
);
|
||||||
|
if (this.using_touch) {
|
||||||
|
overlay.append(mk('p.-controls-hint', "tap to start"));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
overlay.append(mk('p.-controls-hint', "WASD/↑←↓→ to move · space to start without moving"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (this.state === 'paused') {
|
else if (this.state === 'paused') {
|
||||||
overlay.append(mk('h2', "/// paused ///"));
|
overlay.append(mk('h2', "/// paused ///"));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user