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

v0.4.3: examining tiles now shows the correct visual

Browse Source
This commit is contained in:
Evan Debenham 2016-09-30 18:02:46 -04:00
parent ded4589148
commit 2ffffa4162
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java
View File

@ -168,7 +168,7 @@ public class DungeonTilemap extends Tilemap {
public synchronized void updateMap() { public synchronized void updateMap() {
super.updateMap(); super.updateMap();
for (int i = 0; i < data.length; i++) for (int i = 0; i < data.length; i++)
data[i] = setCellVisuals(i ,map[i]); data[i] = getTileVisual(i ,map[i]);
} }
@Override @Override
@ -177,10 +177,10 @@ public class DungeonTilemap extends Tilemap {
super.updateMapCell(cell - mapWidth - 1); super.updateMapCell(cell - mapWidth - 1);
super.updateMapCell(cell + mapWidth + 1); super.updateMapCell(cell + mapWidth + 1);
for (int i : PathFinder.NEIGHBOURS9) for (int i : PathFinder.NEIGHBOURS9)
data[cell+i] = setCellVisuals(cell+i, map[cell+i]); data[cell+i] = getTileVisual(cell+i, map[cell+i]);
} }
private int setCellVisuals(int pos, int tile){ private int getTileVisual(int pos, int tile){
int visual = defaultVisuals.get(tile); int visual = defaultVisuals.get(tile);
if (tile == Terrain.WATER){ if (tile == Terrain.WATER){
@ -227,7 +227,7 @@ public class DungeonTilemap extends Tilemap {
public void discover( int pos, int oldValue ) { public void discover( int pos, int oldValue ) {
final Image tile = tile( oldValue ); final Image tile = tile( pos, oldValue );
tile.point( tileToWorld( pos ) ); tile.point( tileToWorld( pos ) );
parent.add( tile ); parent.add( tile );
@ -250,9 +250,9 @@ public class DungeonTilemap extends Tilemap {
(pos / Dungeon.level.width() + 0.5f) * SIZE ); (pos / Dungeon.level.width() + 0.5f) * SIZE );
} }
public static Image tile( int index ) { public static Image tile( int pos, int tile ) {
Image img = new Image( instance.texture ); Image img = new Image( instance.texture );
img.frame( instance.tileset.get( defaultVisuals.get(index) ) ); img.frame( instance.tileset.get( instance.getTileVisual( pos, tile ) ) );
return img; return img;
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java
View File

@ -76,7 +76,7 @@ public class WndInfoCell extends Window {
water.frame(0, 0, DungeonTilemap.SIZE, DungeonTilemap.SIZE); water.frame(0, 0, DungeonTilemap.SIZE, DungeonTilemap.SIZE);
titlebar.icon(water); titlebar.icon(water);
} else { } else {
titlebar.icon(DungeonTilemap.tile(tile)); titlebar.icon(DungeonTilemap.tile( cell, tile ));
} }
titlebar.label(Dungeon.level.tileName(tile)); titlebar.label(Dungeon.level.tileName(tile));
desc += Dungeon.level.tileDesc(tile); desc += Dungeon.level.tileDesc(tile);