X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fsprite_particle.cpp;h=e914c0ce23b38263d15379683baad0065a6286b6;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=0babaf276149cd6344a75011d01f3ff9719568d2;hpb=da2a51a138aaa81560c6541b411aa3086ad21bca;p=supertux.git diff --git a/src/object/sprite_particle.cpp b/src/object/sprite_particle.cpp index 0babaf276..e914c0ce2 100644 --- a/src/object/sprite_particle.cpp +++ b/src/object/sprite_particle.cpp @@ -17,6 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include #include #include "sprite_particle.hpp" @@ -25,7 +26,7 @@ #include "main.hpp" #include "log.hpp" -SpriteParticle::SpriteParticle(std::string sprite_name, std::string action, Vector position, AnchorPoint anchor, Vector velocity, Vector acceleration, int drawing_layer) +SpriteParticle::SpriteParticle(std::string sprite_name, std::string action, Vector position, AnchorPoint anchor, Vector velocity, Vector acceleration, int drawing_layer) : position(position), velocity(velocity), acceleration(acceleration), drawing_layer(drawing_layer) { sprite = sprite_manager->create(sprite_name); @@ -35,8 +36,8 @@ SpriteParticle::SpriteParticle(std::string sprite_name, std::string action, Vect this->position -= get_anchor_pos(sprite->get_current_hitbox(), anchor); } - -SpriteParticle::~SpriteParticle() + +SpriteParticle::~SpriteParticle() { remove_me(); } @@ -47,7 +48,7 @@ SpriteParticle::hit(Player& ) } void -SpriteParticle::update(float elapsed_time) +SpriteParticle::update(float elapsed_time) { // die when animation is complete if (sprite->animation_done()) { @@ -63,7 +64,7 @@ SpriteParticle::update(float elapsed_time) // die when too far offscreen Vector camera = Sector::current()->camera->get_translation(); - if ((position.x < camera.x - 128) || (position.x > SCREEN_WIDTH + camera.x + 128) || + if ((position.x < camera.x - 128) || (position.x > SCREEN_WIDTH + camera.x + 128) || (position.y < camera.y - 128) || (position.y > SCREEN_HEIGHT + camera.y + 128)) { remove_me(); return; @@ -71,7 +72,7 @@ SpriteParticle::update(float elapsed_time) } void -SpriteParticle::draw(DrawingContext& context) +SpriteParticle::draw(DrawingContext& context) { sprite->draw(context, position, drawing_layer); }