From 6a6797241f12e62a4b3f9a967d7d2a3c757b36d9 Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Mon, 26 Nov 2018 19:33:47 +0100 Subject: Add WorldScene and ActorInfo widget The Scene canvas is now added in MapScene (still a temporary workaround) in a 1x1 GridLayout. --- src/subconscious/graphics/GameWindow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/subconscious/graphics/GameWindow.java') diff --git a/src/subconscious/graphics/GameWindow.java b/src/subconscious/graphics/GameWindow.java index b26d6a4..c3d5474 100644 --- a/src/subconscious/graphics/GameWindow.java +++ b/src/subconscious/graphics/GameWindow.java @@ -25,10 +25,10 @@ public class GameWindow extends Frame implements WindowListener { private Panel root; // reference to the current scene which is NOT on the stack - private Scene scene = null; + private volatile Scene scene = null; private Thread sceneThread = null; // stack of loaded scenes in the background that are paused - private Stack> loadedScenes = new Stack<>(); + private volatile Stack> loadedScenes = new Stack<>(); private volatile Game game; -- cgit v1.2.1