separate nolok sprite

SVN-Revision: 3010

diff --git a/data/images/creatures/nolok/nolok.sprite b/data/images/creatures/nolok/nolok.sprite
new file mode 100644 (file)
index 0000000..c3a41df
--- /dev/null
+++ b/data/images/creatures/nolok/nolok.sprite
@@ -0,0 +1,53 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (fps 6)
+  (x-offset 0)
+  (y-offset 40)
+  (images "walk-0.png"
+          "walk-1.png"
+          "walk-2.png"
+          "walk-3.png"
+         "walk-4.png")
+ )
+
+ (action
+  (name "right")
+  (fps 6)
+  (x-offset 0)
+  (y-offset 40)
+  (mirror-action "left")
+ )
+         
+ (action
+  (name "stand")
+  (x-offset 0)
+  (y-offset 40)
+  (images "walk-0.png")
+ )
+         
+ (action
+  (name "throw")
+  (fps 6)
+  (x-offset 0)
+  (y-offset 40)
+  (images "throw-0.png"
+          "throw-1.png")
+ )
+
+ (action
+  (name "jump")
+  (x-offset 0)
+  (y-offset 40)
+  (images "jump-0.png"
+          "jump-1.png"
+          "jump-2.png")
+ )
+         
+ (action
+  (name "dead")
+  (x-offset 0)
+  (y-offset 0)
+  (images "throw-0.png")
+ )
+)

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index f10bb23..b882252 100644 (file)
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -906,54 +906,6 @@
          (y-offset -12)
          (mirror-action "squished-left")))
 
-; Nolok
-   (sprite (name "nolok")
-       (action
-         (name "left")
-        (fps 6)
-         (x-offset 0)
-         (y-offset 40)
-         (images "creatures/nolok/walk-0.png"
-                "creatures/nolok/walk-1.png"
-                 "creatures/nolok/walk-2.png"
-                "creatures/nolok/walk-3.png"
-                "creatures/nolok/walk-4.png"))
-
-       (action
-         (name "right")
-        (fps 6)
-         (x-offset 0)
-         (y-offset 40)
-         (mirror-action "left"))
-         
-       (action
-         (name "stand")
-         (x-offset 0)
-         (y-offset 40)
-         (images "creatures/nolok/walk-0.png"))
-         
-       (action
-         (name "throw")
-        (fps 6)
-         (x-offset 0)
-         (y-offset 40)
-         (images "creatures/nolok/throw-0.png"
-                "creatures/nolok/throw-1.png"))
-
-       (action
-         (name "jump")
-         (x-offset 0)
-         (y-offset 40)
-         (images "creatures/nolok/jump-0.png"
-                "creatures/nolok/jump-1.png"
-                "creatures/nolok/jump-2.png"))
-         
-       (action
-         (name "dead")
-         (x-offset 0)
-         (y-offset 0)
-         (images "creatures/nolok/throw-0.png")))
-
 ; Zeekling
  (sprite (name "zeekling")
        (action

diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp
index 5888039..513f22a 100644 (file)
--- a/src/badguy/nolok_01.cpp
+++ b/src/badguy/nolok_01.cpp
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include "nolok_01.hpp"
@@ -38,7 +37,7 @@ Nolok_01::Nolok_01(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 63.8);
-  sprite = sprite_manager->create("nolok");
+  sprite = sprite_manager->create("images/creatures/nolok/nolok.sprite");
   countMe = false;
 }
 
@@ -47,7 +46,7 @@ Nolok_01::Nolok_01(float pos_x, float pos_y)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 63.8);
-  sprite = sprite_manager->create("nolok");
+  sprite = sprite_manager->create("images/creatures/nolok/nolok.sprite");
   countMe = false;
 }