v1.1.2: fixed hero being able to rest while cell selectors are present

2022-01-12 16:23:11 -05:00
parent b7119acd3e
commit 336b2f338d
1 changed files with 8 additions and 4 deletions
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
@@ -85,8 +85,10 @@ public class Toolbar extends Component {
 		add(btnWait = new Tool(24, 0, 20, 26) {
 			@Override
 			protected void onClick() {
-				examining = false;
-				Dungeon.hero.rest(false);
+				if (!GameScene.cancel()) {
+					examining = false;
+					Dungeon.hero.rest(false);
+				}
 			}
 			
 			@Override
@@ -95,8 +97,10 @@ public class Toolbar extends Component {
 			}
 			
 			protected boolean onLongClick() {
-				examining = false;
-				Dungeon.hero.rest(true);
+				if (!GameScene.cancel()) {
+					examining = false;
+					Dungeon.hero.rest(true);
+				}
 				return true;
 			}
 		});