projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Made miniswig support HSQUIRRELVM arguments (and realized it was not needed
[supertux.git]
/
src
/
sprite
/
sprite.cpp
diff --git
a/src/sprite/sprite.cpp
b/src/sprite/sprite.cpp
index
38a448d
..
ddc5535
100644
(file)
--- a/
src/sprite/sprite.cpp
+++ b/
src/sprite/sprite.cpp
@@
-23,8
+23,6
@@
#include <cassert>
#include <stdexcept>
#include <cassert>
#include <stdexcept>
-#include "app/globals.h"
-#include "app/setup.h"
#include "sprite.h"
#include "video/drawing_context.h"
#include "sprite.h"
#include "video/drawing_context.h"
@@
-96,8
+94,7
@@
Sprite::update()
}
void
}
void
-Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
- Uint32 drawing_effect)
+Sprite::draw(DrawingContext& context, const Vector& pos, int layer)
{
assert(action != 0);
update();
{
assert(action != 0);
update();
@@
-109,12
+106,12
@@
Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
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),
- layer + action->z_order
, drawing_effect
);
+ layer + action->z_order);
}
void
Sprite::draw_part(DrawingContext& context, const Vector& source,
}
void
Sprite::draw_part(DrawingContext& context, const Vector& source,
- const Vector& size, const Vector& pos, int layer
, Uint32 drawing_effect
)
+ const Vector& size, const Vector& pos, int layer)
{
assert(action != 0);
update();
{
assert(action != 0);
update();
@@
-126,7
+123,7
@@
Sprite::draw_part(DrawingContext& context, const Vector& source,
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),
- layer + action->z_order
, drawing_effect
);
+ layer + action->z_order);
}
int
}
int