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

kay it works

Browse Source
This commit is contained in:
minjaesong
2021-09-06 20:39:54 +09:00
parent 169fad9563
commit fcd1dd2ff2
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -12,7 +12,6 @@ import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZEF import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZEF
import net.torvald.terrarum.blockproperties.Block import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.blockproperties.BlockProp import net.torvald.terrarum.blockproperties.BlockProp
import net.torvald.terrarum.gamecontroller.KeyToggler import net.torvald.terrarum.gamecontroller.KeyToggler
import net.torvald.terrarum.gameitem.ItemID import net.torvald.terrarum.gameitem.ItemID
@@ -1658,6 +1657,7 @@ open class ActorWithBody : Actor {
printdbgerr(this, actorValue.getAsString(AVKey.NAME)) printdbgerr(this, actorValue.getAsString(AVKey.NAME))
printdbgerr(this, if (this is HasAssembledSprite) this.animDescPath else "(not HasAssembledSprite)") printdbgerr(this, if (this is HasAssembledSprite) this.animDescPath else "(not HasAssembledSprite)")
printdbgerr(this, e) printdbgerr(this, e)
throw e
} }
} }
} }

10
src/net/torvald/terrarum/serialise/WriteActor.kt
View File

@@ -2,7 +2,6 @@ package net.torvald.terrarum.serialise
import net.torvald.spriteanimation.HasAssembledSprite import net.torvald.spriteanimation.HasAssembledSprite
import net.torvald.spriteanimation.SpriteAnimation import net.torvald.spriteanimation.SpriteAnimation
import net.torvald.terrarum.AppLoader.printdbgerr
import net.torvald.terrarum.NoSuchActorWithIDException import net.torvald.terrarum.NoSuchActorWithIDException
import net.torvald.terrarum.gameactors.Actor import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
@@ -65,13 +64,10 @@ object ReadActor {
if (actor is Pocketed) if (actor is Pocketed)
actor.inventory.actor = actor actor.inventory.actor = actor
if (actor is ActorWithBody) { if (actor is ActorWithBody && actor is HasAssembledSprite) {
actor.sprite = SpriteAnimation(actor) actor.sprite = SpriteAnimation(actor)
if (actor.animDescPathGlow != null) actor.spriteGlow = SpriteAnimation(actor)
if (actor is HasAssembledSprite) { actor.reassembleSprite(actor.sprite!!, actor.spriteGlow)
if (actor.animDescPathGlow != null) actor.spriteGlow = SpriteAnimation(actor)
actor.reassembleSprite(actor.sprite!!, actor.spriteGlow)
}
} }
return actor return actor