andreacavalli/WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into new-math-rules

Browse Source 
# Conflicts:
#	src/main/java/org/warp/picalculator/StaticVars.java
This commit is contained in:
Andrea Cavalli 2017-12-24 12:31:16 +01:00
commit 563717293d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/warp/picalculator/Main.java
View File

@ -50,6 +50,9 @@ public class Main {
}
Utils.debugThirdScreen = StaticVars.debugOn & false;
for (String arg : args) {
if (arg.contains("2x")) {
StaticVars.debugWindow2x = true;
}
if (arg.contains("headless")) {
Utils.headlessOverride = true;
}

2
src/main/java/org/warp/picalculator/StaticVars.java
View File

@ -11,7 +11,7 @@ public class StaticVars {
public static final int[] screenSize = new int[] { 480, 320 };
public static boolean debugOn;
public static int outputLevel = 5;
public static final boolean debugWindow2x = true;
public static boolean debugWindow2x = false;
public static final Class<?> classLoader = Main.instance.getClass();
private StaticVars() {