moved a few more sprites away from sprites.strf

SVN-Revision: 2978

diff --git a/data/images/objects/keys/key_brass.sprite b/data/images/objects/keys/key_brass.sprite
new file mode 100644 (file)
index 0000000..bf2c234
--- /dev/null
+++ b/data/images/objects/keys/key_brass.sprite
@@ -0,0 +1,14 @@
+(supertux-sprite
+ (action
+  (name "default")
+  (images "key_brass.png")
+ )
+ (action
+  (name "display")
+  (images "display_brass.png")
+ )
+ (action
+  (name "outline")
+  (images "outline_brass.png")
+ )
+)

diff --git a/data/images/objects/keys/key_bronze.sprite b/data/images/objects/keys/key_bronze.sprite
new file mode 100644 (file)
index 0000000..bfa6cda
--- /dev/null
+++ b/data/images/objects/keys/key_bronze.sprite
@@ -0,0 +1,14 @@
+(supertux-sprite
+ (action
+  (name "default")
+  (images "key_bronze.png")
+ )
+ (action
+  (name "display")
+  (images "display_bronze.png")
+ )
+ (action
+  (name "outline")
+  (images "outline_bronze.png")
+ )               
+)

diff --git a/data/images/objects/keys/key_gold.sprite b/data/images/objects/keys/key_gold.sprite
new file mode 100644 (file)
index 0000000..c61c4e8
--- /dev/null
+++ b/data/images/objects/keys/key_gold.sprite
@@ -0,0 +1,14 @@
+(supertux-sprite
+ (action
+  (name "default")
+  (images "key_gold.png")
+ )
+ (action
+  (name "display")
+  (images "display_gold.png")
+ )
+ (action
+  (name "outline")
+  (images "outline_gold.png")
+ )            
+)

diff --git a/data/images/objects/keys/key_iron.sprite b/data/images/objects/keys/key_iron.sprite
new file mode 100644 (file)
index 0000000..7ce58a3
--- /dev/null
+++ b/data/images/objects/keys/key_iron.sprite
@@ -0,0 +1,14 @@
+(supertux-sprite
+ (action
+  (name "default")
+  (images "key_iron.png")
+ )
+ (action
+  (name "display")
+  (images "display_iron.png")
+ )
+ (action
+  (name "outline")
+  (images "outline_iron.png")
+ )           
+)

diff --git a/data/images/objects/keys/key_silver.sprite b/data/images/objects/keys/key_silver.sprite
new file mode 100644 (file)
index 0000000..13382e6
--- /dev/null
+++ b/data/images/objects/keys/key_silver.sprite
@@ -0,0 +1,14 @@
+(supertux-sprite
+ (action
+  (name "default")
+  (images "key_silver.png")
+ )
+ (action
+  (name "display")
+  (images "display_silver.png")
+ )
+ (action
+  (name "outline")
+  (images "outline_silver.png")
+ )           
+)

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index 1ada49e..5d0b9d7 100644 (file)
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -1448,81 +1448,5 @@
       (images "tiles/doodads/platter.png")
     )
   )
-  (sprite
-    (name "key-brass")
-    (action
-      (name "default")
-      (images "objects/keys/key_brass.png")
-    )
-   (action
-      (name "display")
-      (images "objects/keys/display_brass.png")
-    )
-   (action
-      (name "outline")
-      (images "objects/keys/outline_brass.png")
-    )
-
-  )
-  (sprite
-    (name "key-iron")
-    (action
-      (name "default")
-      (images "objects/keys/key_iron.png")
-    )
-   (action
-      (name "display")
-      (images "objects/keys/display_iron.png")
-    )
-    (action
-      (name "outline")
-      (images "objects/keys/outline_iron.png")
-    )
-  )
-  (sprite
-    (name "key-bronze")
-    (action
-      (name "default")
-      (images "objects/keys/key_bronze.png")
-    )
-   (action
-      (name "display")
-      (images "objects/keys/display_bronze.png")
-    )
-    (action
-      (name "outline")
-      (images "objects/keys/outline_bronze.png")
-    )
-  )
-  (sprite
-    (name "key-silver")
-    (action
-      (name "default")
-      (images "objects/keys/key_silver.png")
-    )
-   (action
-      (name "display")
-      (images "objects/keys/display_silver.png")
-    )
-    (action
-      (name "outline")
-      (images "objects/keys/outline_silver.png")
-    )
-  )
-  (sprite
-    (name "key-gold")
-    (action
-      (name "default")
-      (images "objects/keys/key_gold.png")
-    )
-    (action
-      (name "display")
-      (images "objects/keys/display_gold.png")
-    )
-    (action
-      (name "outline")
-      (images "objects/keys/outline_gold.png")
-    )
-  )
 )
 

diff --git a/data/levels/world2/level2.stl b/data/levels/world2/level2.stl
index 64bd0f0..f33f8ea 100644 (file)
--- a/data/levels/world2/level2.stl
+++ b/data/levels/world2/level2.stl
@@ -216,7 +216,7 @@
         (script "levelflip();")
       )
       (powerup (x 8000) (y 352)
-        (sprite "key-gold")
+        (sprite "images/objects/keys/key_gold.sprite")
         (script "get_gold_key();")
         (disable-physics #t)
       )

diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index 7da4bf3..04db0ee 100644 (file)
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -245,7 +245,7 @@ MrIceBlock::set_state(IceState state)
       physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
       // we should slide above 1 block holes now...
-      bbox.set_size(32.5, 31.8);
+      bbox.set_size(34, 31.8);
       break;
     case ICESTATE_GRABBED:
       flat_timer.stop();

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 1e37c7c..bc51aee 100644 (file)
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -42,11 +42,11 @@ PlayerStatus::PlayerStatus()
     max_score_multiplier(1)
 {
   reset();
-  key_brass = sprite_manager->create("key-brass");
-  key_iron = sprite_manager->create("key-iron");
-  key_bronze = sprite_manager->create("key-bronze");
-  key_silver = sprite_manager->create("key-silver");
-  key_gold = sprite_manager->create("key-gold");
+  key_brass = sprite_manager->create("images/objects/keys/key_brass.sprite");
+  key_iron = sprite_manager->create("images/objects/keys/key_iron.sprite");
+  key_bronze = sprite_manager->create("images/objects/keys/key_bronze.sprite");
+  key_silver = sprite_manager->create("images/objects/keys/key_silver.sprite");
+  key_gold = sprite_manager->create("images/objects/keys/key_gold.sprite");
   key_brass->set_action("outline");
   key_iron->set_action("outline");
   key_bronze->set_action("outline");