From 829eb608a75a38d2eea08047f11d3a6b9cdb88bb Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Mon, 1 Jun 2020 17:24:44 -0700 Subject: [PATCH] Workaround for #75 --- core/src/com/riiablo/save/CharData.java | 4 ++++ core/src/com/riiablo/screen/GameScreen.java | 3 +++ core/src/com/riiablo/screen/panel/SpellsQuickPanel.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/com/riiablo/save/CharData.java b/core/src/com/riiablo/save/CharData.java index 66ae2141..1629b0c7 100644 --- a/core/src/com/riiablo/save/CharData.java +++ b/core/src/com/riiablo/save/CharData.java @@ -311,6 +311,10 @@ public class CharData implements ItemController, ItemData.UpdateListener, Pool.P return statData; } + public void update() { + onUpdated(itemData); + } + @Override public void onUpdated(ItemData itemData) { assert itemData.stats == statData; diff --git a/core/src/com/riiablo/screen/GameScreen.java b/core/src/com/riiablo/screen/GameScreen.java index 71968576..ca906eb7 100644 --- a/core/src/com/riiablo/screen/GameScreen.java +++ b/core/src/com/riiablo/screen/GameScreen.java @@ -518,6 +518,9 @@ public class GameScreen extends ScreenAdapter implements GameLoadingScreen.Loada charData.getItems().addLocationListener(Riiablo.cursor); charData.getMerc().getItems().addLocationListener(Riiablo.cursor); + // FIXME: #75 Initial CharData update event + charData.update(); + loadingScreen = new GameLoadingScreen(map, getDependencies()); } diff --git a/core/src/com/riiablo/screen/panel/SpellsQuickPanel.java b/core/src/com/riiablo/screen/panel/SpellsQuickPanel.java index 68c508b2..7e615f1d 100644 --- a/core/src/com/riiablo/screen/panel/SpellsQuickPanel.java +++ b/core/src/com/riiablo/screen/panel/SpellsQuickPanel.java @@ -13,7 +13,6 @@ import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.utils.IntIntMap; import com.badlogic.gdx.utils.ObjectMap; -import com.riiablo.save.CharData; import com.riiablo.CharacterClass; import com.riiablo.Keys; import com.riiablo.Riiablo; @@ -26,6 +25,7 @@ import com.riiablo.item.Stat; import com.riiablo.key.MappedKey; import com.riiablo.key.MappedKeyStateAdapter; import com.riiablo.loader.DC6Loader; +import com.riiablo.save.CharData; import com.riiablo.widget.HotkeyButton; import org.apache.commons.lang3.ArrayUtils;