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

v0.6.1b: Levels no longer set Dungeon.visible

Browse Source
This commit is contained in:
Evan Debenham 2017-08-21 00:04:55 -04:00
parent 55151aa0a9
commit 5d1669431d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@ -261,7 +261,6 @@ public abstract class Level implements Bundlable {
visited = new boolean[length]; visited = new boolean[length];
mapped = new boolean[length]; mapped = new boolean[length];
Dungeon.visible = new boolean[length];
fieldOfView = new boolean[length()]; fieldOfView = new boolean[length()];
@ -527,7 +526,9 @@ public abstract class Level implements Bundlable {
int cell; int cell;
do { do {
cell = Random.Int( length() ); cell = Random.Int( length() );
} while (!passable[cell] || Dungeon.visible[cell] || Actor.findChar( cell ) != null); } while ((Dungeon.level == this && Dungeon.visible[cell])
|| !passable[cell]
|| Actor.findChar( cell ) != null);
return cell; return cell;
} }
@ -668,7 +669,7 @@ public abstract class Level implements Bundlable {
if (heap == null) { if (heap == null) {
heap = new Heap(); heap = new Heap();
heap.seen = Dungeon.visible[cell]; heap.seen = Dungeon.level == this && Dungeon.visible[cell];
heap.pos = cell; heap.pos = cell;
if (map[cell] == Terrain.CHASM || (Dungeon.level != null && pit[cell])) { if (map[cell] == Terrain.CHASM || (Dungeon.level != null && pit[cell])) {
Dungeon.dropToChasm( item ); Dungeon.dropToChasm( item );

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
View File

@ -254,7 +254,7 @@ public abstract class RegularLevel extends Level {
} }
cell = pointToCell(room.random(1)); cell = pointToCell(room.random(1));
if (!Dungeon.visible[cell] if ((Dungeon.level != this || !Dungeon.visible[cell])
&& Actor.findChar( cell ) == null && Actor.findChar( cell ) == null
&& Level.passable[cell] && Level.passable[cell]
&& cell != exit) { && cell != exit) {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
View File

@ -85,6 +85,8 @@ public class InterlevelScene extends PixelScene {
phase = Phase.FADE_IN; phase = Phase.FADE_IN;
timeLeft = TIME_TO_FADE; timeLeft = TIME_TO_FADE;
Dungeon.visible = null;
thread = new Thread() { thread = new Thread() {
@Override @Override
public void run() { public void run() {