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

less stupid name

Browse Source 
Former-commit-id: 4b62bf4b861dc32935489c2b9d063cb0b3b0917c
Former-commit-id: faf1a304fb8f96eaf35ab80b0fa964c6e28e2b96
This commit is contained in:
Song Minjae
2016-11-01 00:18:23 +09:00
parent 60c81baffd
commit 7442472e62
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/StateInGame.kt
View File

@@ -59,7 +59,7 @@ constructor() : BasicGameState() {
lateinit var debugWindow: UIHandler lateinit var debugWindow: UIHandler
lateinit var notifier: UIHandler lateinit var notifier: UIHandler
lateinit internal var playerWrapper: AnyPlayer lateinit internal var playerWrapper: PossessedPlayerWrapper
internal val player: ActorHumanoid // currently POSSESSED actor :) internal val player: ActorHumanoid // currently POSSESSED actor :)
get() = playerWrapper.actor get() = playerWrapper.actor
@@ -126,7 +126,7 @@ constructor() : BasicGameState() {
// add new player and put it to actorContainer // add new player and put it to actorContainer
playerWrapper = AnyPlayer(PlayerBuilderSigrid.create()) playerWrapper = PossessedPlayerWrapper(PlayerBuilderSigrid.create())
//player = PBCynthia.create() //player = PBCynthia.create()
//player.setNoClip(true); //player.setNoClip(true);
addActor(player) addActor(player)
@@ -242,7 +242,7 @@ constructor() : BasicGameState() {
changePossession(Player.PLAYER_REF_ID) // TODO completely other behaviour? changePossession(Player.PLAYER_REF_ID) // TODO completely other behaviour?
} }
private fun changePossession(newActor: AnyPlayer) { private fun changePossession(newActor: PossessedPlayerWrapper) {
if (!hasActor(player)) { if (!hasActor(player)) {
throw IllegalArgumentException("No such actor in actorContainer: $newActor") throw IllegalArgumentException("No such actor in actorContainer: $newActor")
} }
@@ -256,7 +256,7 @@ constructor() : BasicGameState() {
throw IllegalArgumentException("No such actor in actorContainer: $refid") throw IllegalArgumentException("No such actor in actorContainer: $refid")
} }
playerWrapper = AnyPlayer(getActorByID(refid) as ActorHumanoid) playerWrapper = PossessedPlayerWrapper(getActorByID(refid) as ActorHumanoid)
WorldSimulator(world, player, UPDATE_DELTA) WorldSimulator(world, player, UPDATE_DELTA)
} }

3
src/net/torvald/terrarum/gameactors/AnyPlayer.kt → src/net/torvald/terrarum/gameactors/PossessedPlayerWrapper.kt
View File

@@ -6,9 +6,10 @@ import org.newdawn.slick.Input
/** /**
* A wrapper to support instant player changing (or possessing other NPCs maybe) * A wrapper to support instant player changing (or possessing other NPCs maybe)
* *
* @param actor : here you 'snap in' the actor you wish to control
* Created by minjaesong on 16-10-23. * Created by minjaesong on 16-10-23.
*/ */
class AnyPlayer(val actor: ActorHumanoid) { class PossessedPlayerWrapper(val actor: ActorHumanoid) {
init { init {
if (actor !is Controllable) if (actor !is Controllable)