Merge branch 'v121'

DC37 · Mar 5, 2019 · 527e72d · 527e72d
2 parents 0cf5384 + d63d369
commit 527e72d
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/src/smp/SuperMarioPaint.java b/src/smp/SuperMarioPaint.java
@@ -53,7 +53,7 @@
  * @author j574y923
  * 
  * @since 2012.08.16
- * @version 1.1.1
+ * @version 1.2.1
  */
 public class SuperMarioPaint extends Application {
 
@@ -397,34 +397,34 @@ public void changed(ObservableValue<? extends Boolean> ov,
      * @param args
      *            Sets debug options on or off.
      */
-//    public static void main(String[] args) {
-//        if (args.length == 0) {
-//            try {
-//                LauncherImpl.launchApplication(SuperMarioPaint.class,
-//                        SplashScreen.class, args);
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//        } else if (args.length > 0
-//                && (args[0].equals("--debug") || args[0].equals("--d"))) {
-//            if (args[1] != null) {
-//                try {
-//                    Settings.setDebug(Integer.parseInt(args[1]));
-//                } catch (NumberFormatException e) {
-//                    Settings.setDebug(1);
-//                }
-//            } else {
-//                Settings.setDebug(1);
-//            }
-//            try {
-//                LauncherImpl.launchApplication(SuperMarioPaint.class,
-//                        SplashScreen.class, args);
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//        }
-//
-//	}
+    public static void main(String[] args) {
+        if (args.length == 0) {
+            try {
+                LauncherImpl.launchApplication(SuperMarioPaint.class,
+                        SplashScreen.class, args);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if (args.length > 0
+                && (args[0].equals("--debug") || args[0].equals("--d"))) {
+            if (args[1] != null) {
+                try {
+                    Settings.setDebug(Integer.parseInt(args[1]));
+                } catch (NumberFormatException e) {
+                    Settings.setDebug(1);
+                }
+            } else {
+                Settings.setDebug(1);
+            }
+            try {
+                LauncherImpl.launchApplication(SuperMarioPaint.class,
+                        SplashScreen.class, args);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+	}
 
 	/**
 	 * Gets the soundfont Loader. This function will probably only be temporary