LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.1b: further fixes for hero searching more often than intended

Browse Source
This commit is contained in:
Evan Debenham 2017-08-22 23:12:43 -04:00
parent 13e0c37c38
commit 786e9cf0ea
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -483,7 +483,7 @@ public class Hero extends Char {
Dungeon.observe(); Dungeon.observe();
} }
if (curAction == null || search(false)) { if (curAction == null) {
if (resting) { if (resting) {
spend( TIME_TO_REST ); next(); spend( TIME_TO_REST ); next();
@ -1106,6 +1106,8 @@ public class Hero extends Char {
spend( moveTime / speed() ); spend( moveTime / speed() );
search(false);
//FIXME this is a fairly sloppy fix for a crash involving pitfall traps. //FIXME this is a fairly sloppy fix for a crash involving pitfall traps.
//really there should be a way for traps to specify whether action should continue or //really there should be a way for traps to specify whether action should continue or
//not when they are pressed. //not when they are pressed.
@ -1528,7 +1530,7 @@ public class Hero extends Char {
for (int y = ay; y <= by; y++) { for (int y = ay; y <= by; y++) {
for (int x = ax, p = ax + y * Dungeon.level.width(); x <= bx; x++, p++) { for (int x = ax, p = ax + y * Dungeon.level.width(); x <= bx; x++, p++) {
if (Dungeon.visible[p]) { if (Dungeon.visible[p] && p != pos) {
if (intentional) { if (intentional) {
sprite.parent.addToBack( new CheckedCell( p ) ); sprite.parent.addToBack( new CheckedCell( p ) );