konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.1b: fixed rare crashes caused by plant visuals

Browse Source
This commit is contained in:
Evan Debenham
2017-08-23 04:45:09 -04:00
parent e9df79d108
commit bb2828234e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java
+8 -1
View File
@@ -21,6 +21,8 @@
package com.shatteredpixel.shatteredpixeldungeon.tiles; package com.shatteredpixel.shatteredpixeldungeon.tiles;
import android.graphics.RectF;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
@@ -77,13 +79,18 @@ public class TerrainFeaturesTilemap extends DungeonTilemap {
} }
public static Image tile(int pos, int tile ) { public static Image tile(int pos, int tile ) {
RectF uv = instance.tileset.get( instance.getTileVisual( pos, tile, true ) );
if (uv == null) return null;
Image img = new Image( instance.texture ); Image img = new Image( instance.texture );
img.frame( instance.tileset.get( instance.getTileVisual( pos, tile, true ) ) ); img.frame(uv);
return img; return img;
} }
public void growPlant( final int pos ){ public void growPlant( final int pos ){
final Image plant = tile( pos, map[pos] ); final Image plant = tile( pos, map[pos] );
if (plant == null) return;
plant.origin.set( 8, 12 ); plant.origin.set( 8, 12 );
plant.scale.set( 0 ); plant.scale.set( 0 );
plant.point( DungeonTilemap.tileToWorld( pos ) ); plant.point( DungeonTilemap.tileToWorld( pos ) );