2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 00:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #414 from ryleykimmel/enhancement/orientation-duplicate

Browse Source 
Remove duplicate GameObject rotated checks
This commit is contained in:
Major
2019-03-29 22:38:42 +00:00
committed by GitHub
parent 9633dd0cc8 1f539b16ab
commit cd06a69245
4 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/plugin/entity/pathing/src/org/apollo/plugin/entity/pathing/Pathing.kt
+1 -18
View File
@@ -63,21 +63,4 @@ fun Mob.walkTo(target: Position, positionPredicate: ((Position) -> Boolean)? = n
/**
* Returns the bounding size of the specified [Entity], in [x-size, y-size] format.
*/
private fun bounds(target: Entity): Pair<Int, Int> {
return when (target) {
is GameObject -> {
val orientation = Direction.WNES[target.orientation]
val rotated = (orientation == Direction.WEST || orientation == Direction.EAST)
val definition = target.definition
val width = if (rotated) definition.length else definition.width
val height = if (rotated) definition.width else definition.length
Pair(width, height)
}
is Npc -> Pair(target.definition.size, target.definition.size)
is Player -> Pair(1, 1)
else -> error("Invalid entity type")
}
}
private fun bounds(target: Entity): Pair<Int, Int> = Pair(target.width, target.length)