X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsprite%2Fsprite.cpp;h=1c8d0bf80b17c9087c8229b245bdd488d0e3c6e8;hb=0f0e6a3689e5d810ec55b68ff455210b1081a021;hp=9fe4765db0f37c36c69e85a4ccf274b4b6282ce3;hpb=6dd8ff98068af6c053733df6bb01ba47c8eb379e;p=supertux.git diff --git a/src/sprite/sprite.cpp b/src/sprite/sprite.cpp index 9fe4765db..1c8d0bf80 100644 --- a/src/sprite/sprite.cpp +++ b/src/sprite/sprite.cpp @@ -25,6 +25,7 @@ #include "sprite.hpp" #include "video/drawing_context.hpp" +#include "msg.hpp" Sprite::Sprite(SpriteData& newdata) : data(newdata), frame(0), animation_loops(-1) @@ -55,9 +56,7 @@ Sprite::set_action(const std::string& name, int loops) SpriteData::Action* newaction = data.get_action(name); if(!newaction) { -#ifdef DEBUG - std::cerr << "Action '" << name << "' not found.\n"; -#endif + msg_debug("Action '" << name << "' not found."); return; } @@ -100,9 +99,9 @@ Sprite::draw(DrawingContext& context, const Vector& pos, int layer) update(); if((int)frame >= get_frames() || (int)frame < 0) - std::cerr << "Warning: frame out of range: " << (int)frame + msg_warning("frame out of range: " << (int)frame << "/" << get_frames() << " at " << get_name() - << "/" << get_action_name() << std::endl; + << "/" << get_action_name()); else context.draw_surface(action->surfaces[(int)frame], pos - Vector(action->x_offset, action->y_offset), @@ -117,9 +116,9 @@ Sprite::draw_part(DrawingContext& context, const Vector& source, update(); if((int)frame >= get_frames() || (int)frame < 0) - std::cerr << "Warning: frame out of range: " << (int)frame + msg_warning("frame out of range: " << (int)frame << "/" << get_frames() << " at sprite: " << get_name() - << "/" << get_action_name() << std::endl; + << "/" << get_action_name()); else context.draw_surface_part(action->surfaces[(int)frame], source, size, pos - Vector(action->x_offset, action->y_offset),