projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cyrillic fonts from qMax <qwiglydee@gmail.com>
[supertux.git]
/
src
/
sprite
/
sprite.hpp
diff --git
a/src/sprite/sprite.hpp
b/src/sprite/sprite.hpp
index
a43df0a
..
cf44de7
100644
(file)
--- a/
src/sprite/sprite.hpp
+++ b/
src/sprite/sprite.hpp
@@
-22,7
+22,6
@@
#include <string>
#include <assert.h>
#include <string>
#include <assert.h>
-#include <SDL.h>
#include "math/vector.hpp"
#include "math/rect.hpp"
#include "math/vector.hpp"
#include "math/rect.hpp"
@@
-32,7
+31,6
@@
class Surface;
class DrawingContext;
class Surface;
class DrawingContext;
-class Color;
class Blend;
class Sprite
class Blend;
class Sprite
@@
-49,7
+47,10
@@
public:
const Vector& size, const Vector& pos, int layer);
/** Set action (or state) */
const Vector& size, const Vector& pos, int layer);
/** Set action (or state) */
- void set_action(const std::string& act, int loops = -1);
+ void set_action(const std::string& name, int loops = -1);
+
+ /** Set action (or state), but keep current frame number, loop counter, etc. */
+ void set_action_continued(const std::string& name);
/** Set number of animation cycles until animation stops */
void set_animation_loops(int loops = -1)
/** Set number of animation cycles until animation stops */
void set_animation_loops(int loops = -1)
@@
-109,14
+110,14
@@
public:
{ return (int)frame; }
/** Set current frame */
void set_frame(int frame)
{ return (int)frame; }
/** Set current frame */
void set_frame(int frame)
- {
- this->frame = (f
rame % get_frames());
+ {
+ this->frame = (f
loat) (frame % get_frames());
}
Surface* get_frame(unsigned int frame)
{
assert(frame < action->surfaces.size());
return action->surfaces[frame];
}
Surface* get_frame(unsigned int frame)
{
assert(frame < action->surfaces.size());
return action->surfaces[frame];
- }
+ }
private:
void update();
private:
void update();
@@
-134,4
+135,3
@@
private:
};
#endif
};
#endif
-