projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- sounds are on both channels
[supertux.git]
/
src
/
sprite
/
sprite.cpp
diff --git
a/src/sprite/sprite.cpp
b/src/sprite/sprite.cpp
index
2e63074
..
2ee515a
100644
(file)
--- a/
src/sprite/sprite.cpp
+++ b/
src/sprite/sprite.cpp
@@
-63,7
+63,7
@@
Sprite::set_action(const std::string& name, int loops)
if(action && action->name == name)
return;
if(action && action->name == name)
return;
- SpriteData::Action* newaction = data.get_action(name);
+
const
SpriteData::Action* newaction = data.get_action(name);
if(!newaction) {
log_debug << "Action '" << name << "' not found." << std::endl;
return;
if(!newaction) {
log_debug << "Action '" << name << "' not found." << std::endl;
return;
@@
-80,7
+80,7
@@
Sprite::set_action_continued(const std::string& name)
if(action && action->name == name)
return;
if(action && action->name == name)
return;
- SpriteData::Action* newaction = data.get_action(name);
+
const
SpriteData::Action* newaction = data.get_action(name);
if(!newaction) {
log_debug << "Action '" << name << "' not found." << std::endl;
return;
if(!newaction) {
log_debug << "Action '" << name << "' not found." << std::endl;
return;
@@
-221,12
+221,6
@@
Sprite::get_current_hitbox() const
}
void
}
void
-Sprite::set_fps(float new_fps)
-{
- action->fps = new_fps;
-}
-
-void
Sprite::set_angle(float a)
{
angle = a;
Sprite::set_angle(float a)
{
angle = a;