projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unified Messaging Subsystem
[supertux.git]
/
src
/
sprite
/
sprite.cpp
diff --git
a/src/sprite/sprite.cpp
b/src/sprite/sprite.cpp
index
78972c9
..
1c8d0bf
100644
(file)
--- a/
src/sprite/sprite.cpp
+++ b/
src/sprite/sprite.cpp
@@
-25,6
+25,7
@@
#include "sprite.hpp"
#include "video/drawing_context.hpp"
#include "sprite.hpp"
#include "video/drawing_context.hpp"
+#include "msg.hpp"
Sprite::Sprite(SpriteData& newdata)
: data(newdata), frame(0), animation_loops(-1)
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) {
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;
}
return;
}
@@
-67,7
+66,7
@@
Sprite::set_action(const std::string& name, int loops)
}
bool
}
bool
-Sprite::
check_animation
()
+Sprite::
animation_done
()
{
return animation_loops == 0;
}
{
return animation_loops == 0;
}
@@
-75,7
+74,7
@@
Sprite::check_animation()
void
Sprite::update()
{
void
Sprite::update()
{
- if(animation_
loops == 0
)
+ if(animation_
done()
)
return;
Uint32 ticks = SDL_GetTicks();
return;
Uint32 ticks = SDL_GetTicks();
@@
-85,11
+84,11
@@
Sprite::update()
frame += frame_inc;
if(frame >= get_frames()) {
frame += frame_inc;
if(frame >= get_frames()) {
- frame = fmodf(frame
+get_frames()
, get_frames());
-
+ frame = fmodf(frame, get_frames());
+
animation_loops--;
animation_loops--;
- if(animation_
loops == 0
)
- frame =
0
;
+ if(animation_
done()
)
+ frame =
get_frames()-1
;
}
}
}
}
@@
-100,9
+99,9
@@
Sprite::draw(DrawingContext& context, const Vector& pos, int layer)
update();
if((int)frame >= get_frames() || (int)frame < 0)
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_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),
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)
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_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),
else
context.draw_surface_part(action->surfaces[(int)frame], source, size,
pos - Vector(action->x_offset, action->y_offset),