moved some more sprites

SVN-Revision: 2979

diff --git a/data/images/creatures/mr_rocket/explosion.sprite b/data/images/creatures/mr_rocket/explosion.sprite
new file mode 100644 (file)
index 0000000..3b41d7f
--- /dev/null
+++ b/data/images/creatures/mr_rocket/explosion.sprite
@@ -0,0 +1,17 @@
+(supertux-sprite
+ (action
+  (name "explosion-left")
+  (fps 15.0)
+  (x-offset 0)
+  (y-offset 32)
+  (images "explosion-0.png"
+   "explosion-1.png")
+ )
+ (action
+  (name "explosion-right")
+  (fps 15.0)
+  (x-offset 0)
+  (y-offset 32)
+  (mirror-action "explosion-left")
+ )
+)

diff --git a/data/images/creatures/mr_rocket/mr_rocket.sprite b/data/images/creatures/mr_rocket/mr_rocket.sprite
new file mode 100644 (file)
index 0000000..00ea9b1
--- /dev/null
+++ b/data/images/creatures/mr_rocket/mr_rocket.sprite
@@ -0,0 +1,46 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (fps 15.0)
+  (x-offset 3)
+  (y-offset 12)
+  (images "flying-0.png"
+   "flying-1.png"
+   "flying-2.png"
+   "flying-1.png")
+ )
+
+ (action
+  (name "right")
+  (fps 10.0)
+  (x-offset 7)
+  (y-offset 12)
+  (mirror-action "left")
+ )
+
+ (action
+  (name "squished-left")
+  (x-offset 7)
+  (y-offset 0)
+  (images "squished.png")
+ )
+
+ (action
+  (name "squished-right")
+  (x-offset 7)
+  (y-offset 0)
+  (mirror-action "squished-left"))
+
+ (action
+  (name "collision-left")
+  (x-offset 3)
+  (y-offset 12)
+  (images "collision.png"))
+
+ (action
+  (name "collision-right")
+  (x-offset 3)
+  (y-offset 12)
+  (mirror-action "squished-left")
+ )
+)

diff --git a/data/images/creatures/mr_tree/mr_tree.sprite b/data/images/creatures/mr_tree/mr_tree.sprite
new file mode 100644 (file)
index 0000000..f51fa35
--- /dev/null
+++ b/data/images/creatures/mr_tree/mr_tree.sprite
@@ -0,0 +1,38 @@
+(supertux-sprite
+ (action
+  (y-offset -3)
+  (fps 5)
+  (name "left")
+  (images "walk-left-0.png"
+   "walk-left-1.png"
+   "walk-left-2.png")
+ )
+ (action
+  (y-offset -3)
+  (fps 5)
+  (name "right")
+  (mirror-action "left")
+ )
+ (action
+  (y-offset -3)
+  (name "small-left")
+  (images "small-left-0.png"
+   "small-left-1.png"
+   "small-left-2.png")
+ )
+  (action
+   (y-offset -3)
+   (name "small-right")
+   (mirror-action "small-left")
+  )
+  (action
+   (y-offset -6)
+   (name "squished-left")
+   (images "squished-left.png")
+  )
+  (action
+   (y-offset -6)
+   (name "squished-right")
+   (mirror-action "squished-left")
+  )
+)

diff --git a/data/images/creatures/poison_ivy/poison_ivy.sprite b/data/images/creatures/poison_ivy/poison_ivy.sprite
new file mode 100644 (file)
index 0000000..a07d225
--- /dev/null
+++ b/data/images/creatures/poison_ivy/poison_ivy.sprite
@@ -0,0 +1,27 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (x-offset 2)
+  (y-offset 4)
+  (images "left-0.png"
+   "left-1.png"
+   "left-2.png"))
+
+ (action
+  (name "right")
+  (x-offset 2)
+  (y-offset 4)
+  (mirror-action "left"))
+ (action
+  (name "squished-left")
+  (x-offset 1)
+  (y-offset -19)
+  (images "squished.png"))
+
+ (action
+  (name "squished-right")
+  (x-offset 1)
+  (y-offset -19)
+  (mirror-action "squished-left")
+ )
+)

diff --git a/data/images/creatures/spiky/spiky.sprite b/data/images/creatures/spiky/spiky.sprite
new file mode 100644 (file)
index 0000000..07b114f
--- /dev/null
+++ b/data/images/creatures/spiky/spiky.sprite
@@ -0,0 +1,25 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (x-offset 6)
+  (y-offset 10)
+  (images "left-0.png"
+   "left-1.png"
+   "left-2.png"))
+ (action
+  (name "right")
+  (x-offset 6)
+  (y-offset 10)
+  (mirror-action "left"))
+ (action
+  (name "iced-left")
+  (x-offset 6)
+  (y-offset 10)
+  (images "iced-left.png"))
+ (action
+  (name "iced-right")
+  (x-offset 6)
+  (y-offset 10)
+  (mirror-action "iced-left")
+ )
+)

diff --git a/data/images/objects/bell/bell.sprite b/data/images/objects/bell/bell.sprite
new file mode 100644 (file)
index 0000000..76a29ee
--- /dev/null
+++ b/data/images/objects/bell/bell.sprite
@@ -0,0 +1,21 @@
+(supertux-sprite
+ (action
+  (name "normal")
+  (x-offset 0)
+  (y-offset 0)
+  (images "bell-m.png")
+ )
+ (action
+  (name "ringing")
+  (images
+   "bell-l_0.png"
+   "bell-l.png"
+   "bell-l_0.png"
+   "bell-m.png"
+   "bell-r_0.png"
+   "bell-r.png"
+   "bell-r_0.png"
+   "bell-m.png"
+  )
+ )              
+)

diff --git a/data/images/objects/door/door.sprite b/data/images/objects/door/door.sprite
new file mode 100644 (file)
index 0000000..899f5d8
--- /dev/null
+++ b/data/images/objects/door/door.sprite
@@ -0,0 +1,27 @@
+(supertux-sprite
+ (action
+  (name "normal")
+  (x-offset 0)
+  (y-offset 0)
+  (images "door-0.png"))
+ (action
+  (name "open")
+  (x-offset 0)
+  (y-offset 0)
+  (images "door-0.png"
+   "door-1.png"
+   "door-2.png"
+   "door-3.png"
+   "door-4.png"
+   "door-5.png"
+   "door-6.png"
+   "door-7.png"
+   "door-6.png"
+   "door-5.png"
+   "door-4.png"
+   "door-3.png"
+   "door-2.png"
+   "door-1.png"
+   "door-0.png")
+  )
+)

diff --git a/data/images/objects/trampoline/trampoline.sprite b/data/images/objects/trampoline/trampoline.sprite
new file mode 100644 (file)
index 0000000..f7775be
--- /dev/null
+++ b/data/images/objects/trampoline/trampoline.sprite
@@ -0,0 +1,11 @@
+(supertux-sprite
+ (action
+  (x-offset 0)
+  (y-offset 0)
+  (images "trampoline1-0.png"
+   "trampoline1-1.png"
+   "trampoline1-2.png"
+   "trampoline1-3.png"
+   )
+ )
+)

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index 5d0b9d7..e9a933d 100644 (file)
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -906,88 +906,6 @@
          (y-offset -12)
          (mirror-action "squished-left")))
 
-
- (sprite (name "spiky")
-       (action
-         (name "left")
-         (x-offset 6)
-         (y-offset 10)
-         (images "creatures/spiky/left-0.png"
-                 "creatures/spiky/left-1.png"
-                 "creatures/spiky/left-2.png"))
-       (action
-         (name "right")
-         (x-offset 6)
-         (y-offset 10)
-         (mirror-action "left"))
-       (action
-         (name "iced-left")
-         (x-offset 6)
-         (y-offset 10)
-         (images "creatures/spiky/iced-left.png"))
-       (action
-         (name "iced-right")
-         (x-offset 6)
-         (y-offset 10)
-         (mirror-action "iced-left")))
-        
-   ; MrRocket
-   (sprite (name "mrrocket")
-       (action
-         (name "left")
-         (fps 15.0)
-         (x-offset 3)
-         (y-offset 12)
-         (images "creatures/mr_rocket/flying-0.png"
-                "creatures/mr_rocket/flying-1.png"
-                "creatures/mr_rocket/flying-2.png"
-                "creatures/mr_rocket/flying-1.png"))
-
-       (action
-         (name "right")
-         (fps 10.0)
-         (x-offset 7)
-         (y-offset 12)
-         (mirror-action "left"))
-       
-       (action
-         (name "squished-left")
-         (x-offset 7)
-         (y-offset 0)
-         (images "creatures/mr_rocket/squished.png"))
-
-       (action
-         (name "squished-right")
-         (x-offset 7)
-         (y-offset 0)
-         (mirror-action "squished-left"))
-       
-       (action
-         (name "collision-left")
-         (x-offset 3)
-         (y-offset 12)
-         (images "creatures/mr_rocket/collision.png"))
-
-       (action
-         (name "collision-right")
-         (x-offset 3)
-         (y-offset 12)
-         (mirror-action "squished-left")))
-   
-   (sprite (name "rocketexplosion")     
-       (action
-         (name "explosion-left")
-         (fps 15.0)
-         (x-offset 0)
-         (y-offset 32)
-         (images "creatures/mr_rocket/explosion-0.png"
-                 "creatures/mr_rocket/explosion-1.png"))
-       (action
-         (name "explosion-right")
-         (fps 15.0)
-         (x-offset 0)
-         (y-offset 32)
-         (mirror-action "explosion-left")))
 ; Nolok
    (sprite (name "nolok")
        (action
@@ -1036,77 +954,6 @@
          (y-offset 0)
          (images "creatures/nolok/throw-0.png")))
 
-
-
-
-   
-  ; MrTree  
-  (sprite (name "mrtree")
-      (action
-        (y-offset -3)
-        (fps 5)
-        (name "left")
-        (images "creatures/mr_tree/walk-left-0.png"
-                "creatures/mr_tree/walk-left-1.png"
-                "creatures/mr_tree/walk-left-2.png")
-      )
-      (action
-        (y-offset -3)
-        (fps 5)
-        (name "right")
-        (mirror-action "left")
-      )
-      (action
-        (y-offset -3)
-        (name "small-left")
-        (images "creatures/mr_tree/small-left-0.png"
-                "creatures/mr_tree/small-left-1.png"
-                "creatures/mr_tree/small-left-2.png")
-      )
-      (action
-        (y-offset -3)
-        (name "small-right")
-        (mirror-action "small-left")
-      )
-      (action
-        (y-offset -6)
-        (name "squished-left")
-        (images "creatures/mr_tree/squished-left.png")
-      )
-      (action
-        (y-offset -6)
-        (name "squished-right")
-        (mirror-action "squished-left")
-      )
-  )
-
- ; PoisonIvy
- (sprite (name "poisonivy")
-       (action
-         (name "left")
-         (x-offset 2)
-         (y-offset 4)
-         (images "creatures/poison_ivy/left-0.png"
-                 "creatures/poison_ivy/left-1.png"
-                 "creatures/poison_ivy/left-2.png"))
-
-       (action
-         (name "right")
-         (x-offset 2)
-         (y-offset 4)
-         (mirror-action "left"))
-       (action
-         (name "squished-left")
-         (x-offset 1)
-         (y-offset -19)
-         (images "creatures/poison_ivy/squished.png"))
-
-       (action
-         (name "squished-right")
-         (x-offset 1)
-         (y-offset -19)
-         (mirror-action "squished-left")))
-
 ; Zeekling
  (sprite (name "zeekling")
        (action
@@ -1183,16 +1030,6 @@
 
 ;; Game Objects follow
 
-  ; Trampoline
-  (sprite (name "trampoline")
-       (action
-         (x-offset 0)
-         (y-offset 0)
-         (images "objects/trampoline/trampoline1-0.png"
-                 "objects/trampoline/trampoline1-1.png"
-                 "objects/trampoline/trampoline1-2.png"
-                 "objects/trampoline/trampoline1-3.png")))
-
   ; Flying platform
   (sprite (name "platform")
        (action
@@ -1238,33 +1075,6 @@
                  "tiles/firefly/firefly2.png")
        )
   )
-  ; Door
-  (sprite (name "door")
-       (action
-          (name "normal")
-          (x-offset 0)
-          (y-offset 0)
-          (images "objects/door/door-0.png"))
-       (action
-          (name "open")
-          (x-offset 0)
-          (y-offset 0)
-          (images "objects/door/door-0.png"
-                  "objects/door/door-1.png"
-                  "objects/door/door-2.png"
-                  "objects/door/door-3.png"
-                  "objects/door/door-4.png"
-                  "objects/door/door-5.png"
-                  "objects/door/door-6.png"
-                  "objects/door/door-7.png"
-                  "objects/door/door-6.png"
-                  "objects/door/door-5.png"
-                  "objects/door/door-4.png"
-                  "objects/door/door-3.png"
-                  "objects/door/door-2.png"
-                  "objects/door/door-1.png"
-                  "objects/door/door-0.png"))
-  )
 
   ; coin
   (sprite (name "coin")
@@ -1348,28 +1158,6 @@
           (images "objects/particles/stomp.png")
   ))
 
-  (sprite (name "bell")
-       (action
-          (name "normal")
-          (x-offset 0)
-          (y-offset 0)
-          (images "objects/bell/bell-m.png")
-       )
-       (action
-         (name "ringing")
-         (images 
-           "objects/bell/bell-l_0.png"
-           "objects/bell/bell-l.png"
-           "objects/bell/bell-l_0.png"
-           "objects/bell/bell-m.png"
-          "objects/bell/bell-r_0.png"
-           "objects/bell/bell-r.png"
-          "objects/bell/bell-r_0.png"
-           "objects/bell/bell-m.png"
-         )
-       )
-  )
-  
   (sprite (name "unstable_tile")
     (action
       (images "objects/unstable_tile/unstable_tile.png"))
@@ -1397,24 +1185,6 @@
     )
   )
   
-  (sprite (name "worldmaptux")
-    (action
-      (name "small")
-      (y-offset 10) 
-      (images "worldmap/common/smalltux.png")
-    )
-    (action
-      (name "large")
-      (y-offset 10) 
-      (images "worldmap/common/tux.png")
-    )
-    (action
-      (name "fire")
-      (y-offset 10) 
-      (images "worldmap/common/firetux.png")
-    )
-  )
-
   (sprite (name "hatch")
        (action
           (name "normal")

diff --git a/data/images/worldmap/common/tux.sprite b/data/images/worldmap/common/tux.sprite
new file mode 100644 (file)
index 0000000..4cfc812
--- /dev/null
+++ b/data/images/worldmap/common/tux.sprite
@@ -0,0 +1,17 @@
+(supertux-sprite
+ (action
+  (name "small")
+  (y-offset 10)
+  (images "smalltux.png")
+ )
+ (action
+  (name "large")
+  (y-offset 10)
+  (images "tux.png")
+ )
+ (action
+  (name "fire")
+  (y-offset 10)
+  (images "firetux.png")
+ )
+)

diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp
index 95a65d9..2c73f9f 100644 (file)
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -29,7 +29,7 @@ MrRocket::MrRocket(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrrocket");
+  sprite = sprite_manager->create("images/creatures/mr_rocket/mr_rocket.sprite");
   set_direction = false;
 }
 
@@ -38,7 +38,7 @@ MrRocket::MrRocket(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrrocket");
+  sprite = sprite_manager->create("images/creatures/mr_rocket/mr_rocket.sprite");
   set_direction = true;
   initial_direction = d;
 }

diff --git a/src/badguy/mrtree.cpp b/src/badguy/mrtree.cpp
index 73e2c63..3f73bd4 100644 (file)
--- a/src/badguy/mrtree.cpp
+++ b/src/badguy/mrtree.cpp
@@ -31,7 +31,7 @@ MrTree::MrTree(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(84.8, 95.8);
-  sprite = sprite_manager->create("mrtree");
+  sprite = sprite_manager->create("images/creatures/mr_tree/mr_tree.sprite");
 }
 
 void

diff --git a/src/badguy/poisonivy.cpp b/src/badguy/poisonivy.cpp
index 848f560..925b9ca 100644 (file)
--- a/src/badguy/poisonivy.cpp
+++ b/src/badguy/poisonivy.cpp
@@ -29,7 +29,7 @@ PoisonIvy::PoisonIvy(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("poisonivy");
+  sprite = sprite_manager->create("images/creatures/poison_ivy/poison_ivy.sprite");
   set_direction = false;
 }
 
@@ -38,7 +38,7 @@ PoisonIvy::PoisonIvy(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("poisonivy");
+  sprite = sprite_manager->create("images/creatures/poison_ivy/poison_ivy.sprite");
   set_direction = true;
   initial_direction = d;
 }

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index e7f594b..7f2b26d 100644 (file)
--- a/src/badguy/rocketexplosion.cpp
+++ b/src/badguy/rocketexplosion.cpp
@@ -29,7 +29,7 @@ RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
   start_position = pos;
   bbox.set_pos(pos);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("rocketexplosion");
+  sprite = sprite_manager->create("images/creatures/mr_rocket/explosion.sprite");
   this->dir = dir;
   countMe = false;
   explode();

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index 0436883..8561558 100644 (file)
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -29,7 +29,7 @@ Spiky::Spiky(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("spiky");
+  sprite = sprite_manager->create("images/creatures/spiky/spiky.sprite");
 }
 
 void

diff --git a/src/object/bell.cpp b/src/object/bell.cpp
index 0c2036c..97ba802 100644 (file)
--- a/src/object/bell.cpp
+++ b/src/object/bell.cpp
@@ -34,7 +34,7 @@ Bell::Bell(const lisp::Lisp& lisp)
   lisp.get("x", bbox.p1.x);
   lisp.get("y", bbox.p1.y);
   bbox.set_size(32, 32);
-  sprite = sprite_manager->create("bell");
+  sprite = sprite_manager->create("images/objects/bell/bell.sprite");
   set_group(COLGROUP_TOUCHABLE);
 }
 

diff --git a/src/object/gameobjs.cpp b/src/object/gameobjs.cpp
index 75c1096..8bc045c 100644 (file)
--- a/src/object/gameobjs.cpp
+++ b/src/object/gameobjs.cpp
@@ -248,11 +248,6 @@ Particles::draw(DrawingContext& context)
 
 void load_object_gfx()
 {
-#if 0
-  img_trampoline = sprite_manager->load("trampoline");
-  img_trampoline->start_animation(0);
-  img_flying_platform = sprite_manager->load("flying_platform");
-#endif
   img_smoke_cloud = sprite_manager->create("stomp");
 }
 

diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp
index caaaf0a..cdb05ff 100644 (file)
--- a/src/trigger/door.cpp
+++ b/src/trigger/door.cpp
@@ -37,7 +37,7 @@ Door::Door(const lisp::Lisp& reader)
   reader.get("sector", target_sector);
   reader.get("spawnpoint", target_spawnpoint);
 
-  sprite = sprite_manager->create("door");
+  sprite = sprite_manager->create("images/objects/door/door.sprite");
 }
 
 Door::Door(int x, int y, std::string sector, std::string spawnpoint)

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index dd57ce9..73a13b9 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -118,7 +118,7 @@ string_to_direction(const std::string& directory)
 Tux::Tux(WorldMap* worldmap_)
   : worldmap(worldmap_)
 {
-  tux_sprite = sprite_manager->create("worldmaptux");
+  tux_sprite = sprite_manager->create("images/worldmap/common/tux.sprite");
   
   offset = 0;
   moving = false;