projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
70f26d6
)
Removed trampoline sprites hack.
author
Ricardo Cruz
<rick2@aeiou.pt>
Sat, 14 Aug 2004 11:33:53 +0000
(11:33 +0000)
committer
Ricardo Cruz
<rick2@aeiou.pt>
Sat, 14 Aug 2004 11:33:53 +0000
(11:33 +0000)
SVN-Revision: 1774
src/gameobjs.cpp
patch
|
blob
|
history
src/gameobjs.h
patch
|
blob
|
history
diff --git
a/src/gameobjs.cpp
b/src/gameobjs.cpp
index
95e544a
..
ccd9b83
100644
(file)
--- a/
src/gameobjs.cpp
+++ b/
src/gameobjs.cpp
@@
-137,7
+137,7
@@
FloatingScore::draw(DrawingContext& context)
/* Trampoline */
/* Trampoline */
-Sprite *img_trampoline
[TRAMPOLINE_FRAMES]
;
+Sprite *img_trampoline;
Trampoline::Trampoline(LispReader& reader)
{
Trampoline::Trampoline(LispReader& reader)
{
@@
-181,7
+181,8
@@
Trampoline::write(LispWriter& writer)
void
Trampoline::draw(DrawingContext& context)
{
void
Trampoline::draw(DrawingContext& context)
{
- img_trampoline[frame]->draw(context, base, LAYER_OBJECTS);
+ img_trampoline->set_frame(frame);
+ img_trampoline->draw(context, base, LAYER_OBJECTS);
frame = 0;
}
frame = 0;
}
@@
-438,15
+439,7
@@
SmokeCloud::draw(DrawingContext& context)
void load_object_gfx()
{
void load_object_gfx()
{
- char sprite_name[16];
-
- for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
- {
- sprintf(sprite_name, "trampoline-%i", i+1);
- img_trampoline[i] = sprite_manager->load(sprite_name);
- }
-
+ img_trampoline = sprite_manager->load("trampoline");
img_flying_platform = sprite_manager->load("flying_platform");
img_flying_platform = sprite_manager->load("flying_platform");
-
img_smoke_cloud = sprite_manager->load("stomp");
}
img_smoke_cloud = sprite_manager->load("stomp");
}
diff --git
a/src/gameobjs.h
b/src/gameobjs.h
index
9112cae
..
04665be
100644
(file)
--- a/
src/gameobjs.h
+++ b/
src/gameobjs.h
@@
-105,8
+105,7
@@
private:
Timer timer;
};
Timer timer;
};
-#define TRAMPOLINE_FRAMES 4
-extern Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+extern Sprite *img_trampoline;
class Trampoline : public MovingObject, public Serializable
{
class Trampoline : public MovingObject, public Serializable
{