Modify Gag to use ResourceMan

2 files changed, 9 insertions, 11 deletions

diff --git a/Gag.js b/Gag.js
index 2fa4754..ff8d31c 100644
--- a/Gag.js
+++ b/Gag.js
@@ -5,15 +5,13 @@ var Gag = function(cat, x, y, dir) {
 }
 var p = Gag.prototype = new Container();
 
-    Gag.initialize = function() {
-        Gag.img = new Image();
-        Gag.img.onload = function() {
-            Gag.gfx = new Bitmap(Gag.img);
-        }
-        Gag.img.src = "gfx/catgag.png";
-    }
-    Gag.initialize();
-    Gag.count = 0;
+Gag.count = 0;
+Gag.img = null;
+
+Gag.initialize = function() {
+    Gag.img = Game.resMan.get("catgag");
+    Gag.gfx = new Bitmap(Gag.img);
+}
     
     p.escaped = false;
     p.dir = 0;
@@ -31,7 +29,7 @@ var p = Gag.prototype = new Container();
         this.dir = dir;
         this.cat = cat;
         
-        this.gfx = new Bitmap(Gag.img);
+        this.gfx = Gag.gfx.clone();
         this.addChild(this.gfx);
         
         cat.getStage().addChild(this);
diff --git a/catgag.js b/catgag.js
index 513bf17..7ef5e4f 100644
--- a/catgag.js
+++ b/catgag.js
@@ -47,7 +47,7 @@ Game.resMan.add("vacuum12", "vacuum_12.png");
 Game.resMan.add("vacuum21", "vacuum_21.png");
 Game.resMan.add("vacuum22", "vacuum_22.png");
 Game.resMan.done = function() {
-    window.Log("done");
+    Gag.initialize();
     Game.init();
 }