X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsprite%2Fsprite.hpp;h=a3edb33534d1f5c2fbccd256f1c993bd6df2b3e7;hb=82a7fa5517cd6a5be53156776b556631927baf4e;hp=a43df0a16d7154dc1882ab569c95f0c0e3a88e70;hpb=6b50afc6cdd8d3555901b02ce12f15b5bac32aa8;p=supertux.git diff --git a/src/sprite/sprite.hpp b/src/sprite/sprite.hpp index a43df0a16..a3edb3353 100644 --- a/src/sprite/sprite.hpp +++ b/src/sprite/sprite.hpp @@ -22,7 +22,6 @@ #include #include -#include #include "math/vector.hpp" #include "math/rect.hpp" @@ -32,7 +31,6 @@ class Surface; class DrawingContext; -class Color; class Blend; class Sprite @@ -109,14 +107,14 @@ public: { return (int)frame; } /** Set current frame */ void set_frame(int frame) - { - this->frame = (frame % get_frames()); + { + this->frame = (float) (frame % get_frames()); } Surface* get_frame(unsigned int frame) { assert(frame < action->surfaces.size()); return action->surfaces[frame]; - } + } private: void update(); @@ -134,4 +132,3 @@ private: }; #endif -