diff --git a/.idea/artifacts/Runtime.xml b/.idea/artifacts/Runtime.xml
deleted file mode 100644
index 25a93b315..000000000
--- a/.idea/artifacts/Runtime.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
- $PROJECT_DIR$/out/artifacts/Runtime
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/gameworld/WorldSimulator.kt b/src/net/torvald/terrarum/gameworld/WorldSimulator.kt
index e2f303b4a..84161ef90 100644
--- a/src/net/torvald/terrarum/gameworld/WorldSimulator.kt
+++ b/src/net/torvald/terrarum/gameworld/WorldSimulator.kt
@@ -469,9 +469,9 @@ object WorldSimulator {
* @return List of FixtureBases, safe to cast into Electric
*/
private fun wiresimGetSourceBlocks(): List =
- INGAME.actorContainerActive.filter {
- it is FixtureBase && it is Electric && it.inUpdateRange(world) && it.wireEmitterTypes.isNotEmpty()
- } as List
+ INGAME.actorContainerActive.filterIsInstance().filter {
+ it is Electric && it.inUpdateRange(world) && it.wireEmitterTypes.isNotEmpty()
+ }
private val wireSimMarked = HashSet()
private val wireSimPoints = Queue()
diff --git a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
index b6c08f917..9e36a58c6 100644
--- a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
+++ b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
@@ -855,9 +855,8 @@ object IngameRenderer : Disposable {
shaderBlendGlow.dispose()
shaderAlphaDither.dispose()
- try {
- fboRGBexport.dispose()
- }
+ try { fboRGBexport.dispose() }
+ catch (e: GdxRuntimeException) {}
catch (e: UninitializedPropertyAccessException) {}
catch (e: Throwable) { e.printStackTrace(System.out) }
}
diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
index a47b5803c..853ae409f 100644
--- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
@@ -676,7 +676,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
}
private var updateAkku = 0f
- private var autosaveTimer = 0f
+ internal var autosaveTimer = 0f
override fun render(`_`: Float) {
// Q&D solution for LoadScreen and Ingame, where while LoadScreen is working, Ingame now no longer has GL Context
diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt
index 0be065a02..51fad7f18 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt
@@ -30,7 +30,6 @@ class FixtureLogicSignalEmitter : FixtureBase, Electric {
}
CommonResourcePool.loadAll()
-
density = 1400.0
setHitboxDimension(TILE_SIZE, TILE_SIZE, 0, -1)
@@ -38,9 +37,14 @@ class FixtureLogicSignalEmitter : FixtureBase, Electric {
sprite!!.setRowsAndFrames(1, 1)
actorValue[AVKey.BASEMASS] = MASS
+ }
+ override fun update(delta: Float) {
+ // the values does not get preserved on save reload??
wireEmitterTypes["digital_bit"] = 0
wireEmission[0] = Vector2(1.0, 0.0)
+
+ super.update(delta)
}
override fun dispose() { }
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
index 117a32f61..64ac3b8ca 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
@@ -1,6 +1,5 @@
package net.torvald.terrarum.modulebasegame.ui
-import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch
@@ -122,6 +121,7 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
screen = 0
full.handler.unlockToggle()
full.unlockTransition()
+ (INGAME as TerrarumIngame).autosaveTimer = 0f
}
}