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

fix: bombs may cause segfault due to out of bound referencing in Y axis

Browse Source
This commit is contained in:
minjaesong
2024-08-27 00:28:54 +09:00
parent 86c7f7925b
commit 45550d0444
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/modulebasegame/ExplosionManager.kt
View File

@@ -33,12 +33,16 @@ object ExplosionManager {
val CALC_RADIUS = power.ceilToInt() + 2 val CALC_RADIUS = power.ceilToInt() + 2
val CALC_WIDTH = CALC_RADIUS * 2 + 1 val CALC_WIDTH = CALC_RADIUS * 2 + 1
val lineMin = CALC_RADIUS - ty
val lineMax = world.height - ty + CALC_RADIUS
// create a copy of the tilemap // create a copy of the tilemap
val tilemap = BlockLayerI16(CALC_WIDTH, CALC_WIDTH) val tilemap = BlockLayerI16(CALC_WIDTH, CALC_WIDTH)
val breakmap = UnsafeFloatArray(CALC_WIDTH, CALC_WIDTH) val breakmap = UnsafeFloatArray(CALC_WIDTH, CALC_WIDTH)
// fill in the tilemap copy // fill in the tilemap copy
for (line in 0 until CALC_WIDTH) { for (line0 in 0 until CALC_WIDTH) {
val line = line0.coerceIn(lineMin until lineMax)
memcpyFromWorldTiles(CALC_RADIUS, CALC_WIDTH, world, tx - CALC_RADIUS, ty - CALC_RADIUS, line, tilemap) memcpyFromWorldTiles(CALC_RADIUS, CALC_WIDTH, world, tx - CALC_RADIUS, ty - CALC_RADIUS, line, tilemap)
memcpyFromWorldBreakage(CALC_WIDTH, world, tx - CALC_RADIUS, ty - CALC_RADIUS, line, breakmap) memcpyFromWorldBreakage(CALC_WIDTH, world, tx - CALC_RADIUS, ty - CALC_RADIUS, line, breakmap)
} }