X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FMain.java;h=ceb7efa65b813184d9936cbbb0998fbdc0cbcdf7;hb=439e58899c718846994d6389ece66ee73a9045ed;hp=b7be374d4f94b6a1db563a428dab736a006924ac;hpb=3d508f14106e7e14499e643bf28da083804ba1de;p=org.ibex.core.git

diff --git a/src/org/ibex/core/Main.java b/src/org/ibex/core/Main.java
index b7be374..ceb7efa 100644
--- a/src/org/ibex/core/Main.java
+++ b/src/org/ibex/core/Main.java
@@ -8,6 +8,7 @@ import org.ibex.js.*;
 import org.ibex.util.*;
 import org.ibex.plat.*;
 import org.ibex.graphics.*;
+import org.ibex.core.builtin.*;
 
 /** Entry point for the Ibex Engine; handles splash screen, initial xwar loading, and argument processing */
 public class Main {
@@ -35,7 +36,7 @@ public class Main {
         System.err.println("    -l user@host    email log to user@host");
         System.err.println("    -l host:port    emit log to TCP socket");
         System.err.println("    -l <file>       write log to a file on disk");
-        System.err.println("    -a              check assertions");
+        //System.err.println("    -a              check assertions");
         System.err.println("    -w <window-id>  reserved for libibex");
         System.err.println("    -p              dump profiling information [not yet supported]");
         Runtime.getRuntime().exit(-1);
@@ -45,7 +46,8 @@ public class Main {
         int startargs = 0;
         while (true) {
             if (startargs > args.length - 1) printUsage();
-            else if (args[startargs].equals("-a")) JS.checkAssertions = true;
+            // FEATURE: This should be enabled at the parser level - there shouldn't even be an assert bytecode
+            /*else if (args[startargs].equals("-a")) JS.checkAssertions = true;*/
             else if (args[startargs].equals("-l")) {
                 startargs++;
                 StringTokenizer opts = new StringTokenizer(args[startargs], ",");
@@ -93,7 +95,7 @@ public class Main {
         final Ibex ibex = new Ibex(rr);
 
         org.ibex.graphics.Surface.scarImage =
-            Picture.load((Stream)Main.builtin.get("org/ibex/core/builtin/scar.png"),
+            Picture.load(new Stream.FromInputStream(Encode.JavaSourceCode.decode(Scar.data)),
                          new Task() { public void perform() throws JSExn, UnknownHostException {
                              if (Log.on) Log.info(Main.class, "invoking initial template");
                              ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);