curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 12:04:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

something's not right with tile numbering

Browse Source
This commit is contained in:
minjaesong
2021-02-20 15:10:47 +09:00
parent 295dd8b8d6
commit 463e59087c
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/net/torvald/terrarum/gameworld/GameWorld.kt
View File

@@ -147,6 +147,8 @@ open class GameWorld : Disposable {
tileNumberToNameMap = HashMap<Int, ItemID>()
tileNameToNumberMap = HashMap<ItemID, Int>()
CreateTileAtlas.tags.forEach {
printdbg(this, "tileNumber ${it.value.tileNumber} <-> tileName ${it.key}")
tileNumberToNameMap[it.value.tileNumber] = it.key
tileNameToNumberMap[it.key] = it.value.tileNumber
}
@@ -224,7 +226,14 @@ open class GameWorld : Disposable {
*/
fun getTileFromTerrain(rawX: Int, rawY: Int): ItemID {
val (x, y) = coerceXY(rawX, rawY)
return tileNumberToNameMap[layerTerrain.unsafeGetTile(x, y)]!!
try {
return tileNumberToNameMap[layerTerrain.unsafeGetTile(x, y)]!!
}
catch (e: NullPointerException) {
System.err.println("NPE for tilenum ${layerTerrain.unsafeGetTile(x, y)}")
throw e
}
}
/**