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

removing codes for renderorder-to-number relation

Browse Source
This commit is contained in:
minjaesong
2023-10-06 16:20:12 +09:00
parent bfa6cbe2da
commit 22def38cf7
3 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -347,13 +347,7 @@ object Terrarum : Disposable {
* override var referenceID: Int = generateUniqueReferenceID()
*/
fun generateUniqueReferenceID(renderOrder: Actor.RenderOrder): ActorID {
fun renderOrderToRange(renderOrder: Actor.RenderOrder) = when (renderOrder) {
Actor.RenderOrder.BEHIND -> Actor.RANGE_BEHIND
Actor.RenderOrder.MIDDLE -> Actor.RANGE_MIDDLE
Actor.RenderOrder.MIDTOP -> Actor.RANGE_MIDTOP
Actor.RenderOrder.FRONT -> Actor.RANGE_FRONT
Actor.RenderOrder.OVERLAY-> Actor.RANGE_OVERLAY
}
// render orders can be changed arbitrarily so the whole "renderorder to actor id" is only there for an initial sorting
fun hasCollision(value: ActorID) =
try {
Terrarum.ingame?.theGameHasActor(value) == true
@@ -364,7 +358,7 @@ object Terrarum : Disposable {
var ret: Int
do {
val range = renderOrderToRange(renderOrder)
val range = ReferencingRanges.ACTORS
val size = range.last - range.first + 1
ret = (HQRNG().nextInt().rem(size) + range.first) and 0x7FFF_FF00 // make room for sub-actors
} while (hasCollision(ret)) // check for collision