X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FMain.java;h=4fd76f0a11d16eac099af0e35c56ca3b496124e0;hb=81eda5b4fc7bdf083aa6af02c971d3a75a3c39d5;hp=a9c35df8a742eb94c5d3b1b84a9f8f83ae631efe;hpb=890000a10a0ccdc49f62946bddf1c0b840495a94;p=org.ibex.core.git

diff --git a/src/org/ibex/core/Main.java b/src/org/ibex/core/Main.java
index a9c35df..4fd76f0 100644
--- a/src/org/ibex/core/Main.java
+++ b/src/org/ibex/core/Main.java
@@ -11,7 +11,6 @@ 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 {
@@ -29,7 +28,15 @@ public class Main {
     public static String origin = null;
     public static String initialTemplate = null;
     
-    public static final Fountain builtin = new Fountain.Zip(new Fountain.FromInputStream(Platform.getBuiltinInputStream()));
+    //public static final Fountain builtin = new Fountain.Zip(new Fountain.FromInputStream(Platform.getBuiltinInputStream()));
+    public static final Fountain vera;
+    static {
+        Fountain temp = null;
+        try {
+            temp = new Fountain.FromInputStream(Encode.JavaSourceCode.decode(Vera.data));
+        } catch (Exception e) { Log.error(Main.class, e); }
+        vera = temp;
+    }
 
     public static void printUsage() {
         System.err.println("Usage: ibex [-lawp] [ url | file | directory ]");
@@ -99,19 +106,24 @@ public class Main {
         if (Log.on) Log.info(Main.class, "loading xwar");
         final Ibex ibex = new Ibex(rr);
 
-        org.ibex.graphics.Surface.scarImage =
-            Picture.load(new Fountain.FromInputStream(Encode.JavaSourceCode.decode(Scar.data)),
-                         new Callable() {
-                             private final JS[] callargs = new JS[1];
-                             public Object run(Object o) throws JSExn,UnknownHostException {
-                                 if (Log.on) Log.info(Main.class, "invoking initial template");
-                                 try {
-                                     callargs[0] = new Box(); 
-                                     ibex.resolveString(startupTemplate, false).call(null, callargs);
-                                 } finally { callargs[0] = null; }
-                                 return null;
-                         } });
+        try {
+            JS blessed = ibex.bless(new Fountain.FromInputStream(Encode.JavaSourceCode.decode(org.ibex.core.builtin.Scar.data)));
+            org.ibex.graphics.Surface.scarImage = Platform.createPicture(blessed);
+        } catch (Exception e) {
+            Log.error(Main.class, e);
+        }
 
+        Platform.Scheduler.add(new Callable() {
+            private final JS[] callargs = new JS[1];
+            public Object run(Object o) throws JSExn,UnknownHostException {
+                if (Log.on) Log.info(Main.class, "invoking initial template");
+                try {
+                    callargs[0] = new Box(); 
+                    ibex.resolveString(startupTemplate, false).call(null, callargs);
+                } finally { callargs[0] = null; }
+                return null;
+            } });
+    
         Platform.Scheduler.init();
     }
 }