diff options
| author | Nao Pross <naopross@thearcway.org> | 2018-11-26 19:33:47 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2018-11-26 19:36:12 +0100 |
| commit | 6a6797241f12e62a4b3f9a967d7d2a3c757b36d9 (patch) | |
| tree | 4d08386697523475a590f9db8e4727570e136557 /src/subconscious/graphics/GameWindow.java | |
| parent | Remove old MapEditor code (diff) | |
| download | Subconscious-java-6a6797241f12e62a4b3f9a967d7d2a3c757b36d9.tar.gz Subconscious-java-6a6797241f12e62a4b3f9a967d7d2a3c757b36d9.zip | |
Add WorldScene and ActorInfo widget
The Scene canvas is now added in MapScene (still a temporary
workaround) in a 1x1 GridLayout.
Diffstat (limited to 'src/subconscious/graphics/GameWindow.java')
| -rw-r--r-- | src/subconscious/graphics/GameWindow.java | 4 |
1 files changed, 2 insertions, 2 deletions
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<SimpleEntry<Scene, Thread>> loadedScenes = new Stack<>(); + private volatile Stack<SimpleEntry<Scene, Thread>> loadedScenes = new Stack<>(); private volatile Game game; |