From 7361e2120c8a5db222219e8b556c9efc8eda7bcc Mon Sep 17 00:00:00 2001 From: Stephen Groundwater Date: Sat, 22 Jul 2006 13:54:46 +0000 Subject: [PATCH] putting mr.bomb back a version. SVN-Revision: 4065 --- src/badguy/bomb.cpp | 4 ++-- src/badguy/bomb.hpp | 2 +- src/badguy/mrbomb.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp index c26fe15b1..dc1853757 100644 --- a/src/badguy/bomb.cpp +++ b/src/badguy/bomb.cpp @@ -23,7 +23,7 @@ #include "random_generator.hpp" #include "object/sprite_particle.hpp" -Bomb::Bomb(const Vector& pos, Direction dir, std::string custom_sprite /*= "images/creatures/mr_cherry/cherry.sprite"*/ ) +Bomb::Bomb(const Vector& pos, Direction dir, std::string custom_sprite /*= "images/creatures/mr_bomb/mr_bomb.sprite"*/ ) : BadGuy( pos, dir, custom_sprite ) { state = STATE_TICKING; @@ -118,7 +118,7 @@ Bomb::explode() float vy = -cos(angle)*velocity; Vector pspeed = Vector(vx, vy); Vector paccel = Vector(0, 1000); - Sector::current()->add_object(new SpriteParticle("images/objects/particles/kracker.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1)); + Sector::current()->add_object(new SpriteParticle("images/objects/particles/explosion.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1)); } } diff --git a/src/badguy/bomb.hpp b/src/badguy/bomb.hpp index 430c270d0..efce65357 100644 --- a/src/badguy/bomb.hpp +++ b/src/badguy/bomb.hpp @@ -25,7 +25,7 @@ class Bomb : public BadGuy { public: - Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_cherry/cherry.sprite" ); + Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_bomb/bomb.sprite" ); Bomb(const Bomb& bomb); void write(lisp::Writer& writer); diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp index 0cbb71ea4..68e076892 100644 --- a/src/badguy/mrbomb.cpp +++ b/src/badguy/mrbomb.cpp @@ -24,7 +24,7 @@ #include "sprite/sprite_manager.hpp" MrBomb::MrBomb(const lisp::Lisp& reader) - : WalkingBadguy(reader, "images/creatures/mr_cherry/mr_juicebox.sprite", "left", "right") + : WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right") { walk_speed = 80; max_drop_height = 0; @@ -34,7 +34,7 @@ MrBomb::MrBomb(const lisp::Lisp& reader) return; } if( sprite_name == "" ){ - sprite_name = "images/creatures/mr_cherry/juicebox.sprite"; + sprite_name = "images/creatures/mr_bomb/mr_bomb.sprite"; return; } //Replace sprite @@ -43,7 +43,7 @@ MrBomb::MrBomb(const lisp::Lisp& reader) /* MrBomb created by a despencer always gets default sprite atm.*/ MrBomb::MrBomb(const Vector& pos, Direction d) - : WalkingBadguy(pos, d, "images/creatures/mr_cherry/juicebox.sprite", "left", "right") + : WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right") { walk_speed = 80; max_drop_height = 0; -- 2.11.0