summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2018-11-24 18:52:22 +0100
committerNao Pross <naopross@thearcway.org>2018-11-24 18:52:22 +0100
commit9892e2b286bcb01dfce2bd723d760c4e64cd0803 (patch)
tree348d06389e7c700206787102bee18c4945707004
parentCall Game.update() on Scene loop (diff)
downloadSubconscious-java-9892e2b286bcb01dfce2bd723d760c4e64cd0803.tar.gz
Subconscious-java-9892e2b286bcb01dfce2bd723d760c4e64cd0803.zip
Enable use of assertions
Assertions are faster and normally not enabled, so they are a good to debug when things that *should* never happen, happen.
-rw-r--r--Makefile6
-rw-r--r--src/subconscious/graphics/GameWindow.java4
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cb157b1..e2ef854 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@
MAINCLASS := subconscious.Subconscious
SOURCES := $(shell find src -iname '*.java')
+# debug or release mode
+DEBUG=1
+
# java compiler configuraton
JAVAC := javac
JAVAC_ARGS := -Xlint:all \
@@ -19,6 +22,9 @@ JAVA_ARGS := -cp ../lib/gson-2.6.2.jar:. -Xmx2G
ifeq ($(USE_JDB),1)
JAVA_ARGS += -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
endif
+ifeq ($(DEBUG),1)
+ JAVA_ARGS += -enableassertions
+endif
# recipes
diff --git a/src/subconscious/graphics/GameWindow.java b/src/subconscious/graphics/GameWindow.java
index f444a6a..eb360f5 100644
--- a/src/subconscious/graphics/GameWindow.java
+++ b/src/subconscious/graphics/GameWindow.java
@@ -150,9 +150,7 @@ public class GameWindow extends Frame implements WindowListener {
this.root.getLayout().removeLayoutComponent(this.scene);
this.root.remove(this.scene);
- if (this.loadedScenes.empty()) {
- throw new IllegalStateException();
- }
+ assert !this.loadedScenes.empty();
// load the last scene
SimpleEntry<Scene, Thread> sceneEntry = this.loadedScenes.pop();