projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- committed patch from Richard Smith
[supertux.git]
/
src
/
special.h
diff --git
a/src/special.h
b/src/special.h
index
304d209
..
0e69b89
100644
(file)
--- a/
src/special.h
+++ b/
src/special.h
@@
-20,13
+20,14
@@
#ifndef SUPERTUX_SPECIAL_H
#define SUPERTUX_SPECIAL_H
#ifndef SUPERTUX_SPECIAL_H
#define SUPERTUX_SPECIAL_H
-#include <SDL.h>
+#include "SDL.h"
+
#include "bitmask.h"
#include "bitmask.h"
-#include "
typ
e.h"
-#include "
textur
e.h"
+#include "
special/bas
e.h"
+#include "
video/surfac
e.h"
#include "collision.h"
#include "player.h"
#include "collision.h"
#include "player.h"
-#include "physic.h"
+#include "
math/
physic.h"
/* Upgrade types: */
/* Upgrade types: */
@@
-34,26
+35,25
@@
enum UpgradeKind {
UPGRADE_GROWUP,
UPGRADE_FIREFLOWER,
UPGRADE_ICEFLOWER,
UPGRADE_GROWUP,
UPGRADE_FIREFLOWER,
UPGRADE_ICEFLOWER,
- UPGRADE_
HERRING
,
+ UPGRADE_
STAR
,
UPGRADE_1UP
};
void load_special_gfx();
void free_special_gfx();
UPGRADE_1UP
};
void load_special_gfx();
void free_special_gfx();
-class Upgrade : public MovingObject
, public Drawable
+class Upgrade : public MovingObject
{
public:
UpgradeKind kind;
Direction dir;
Physic physic;
{
public:
UpgradeKind kind;
Direction dir;
Physic physic;
- Upgrade(DisplayManager& display_manager, const Vector& pos, Direction dir,
- UpgradeKind kind);
+ Upgrade(const Vector& pos, Direction dir, UpgradeKind kind);
virtual ~Upgrade();
virtual void action(float frame_ratio);
virtual ~Upgrade();
virtual void action(float frame_ratio);
- virtual void draw(
Camera& viewport, int layer
);
+ virtual void draw(
DrawingContext& context
);
virtual void collision(const MovingObject& other, int);
void collision(void* p_c_object, int c_object, CollisionType type);
virtual void collision(const MovingObject& other, int);
void collision(void* p_c_object, int c_object, CollisionType type);
@@
-67,14
+67,14
@@
enum BulletsKind {
ICE_BULLET
};
ICE_BULLET
};
-class Bullet : public MovingObject
, public Drawable
+class Bullet : public MovingObject
{
public:
{
public:
- Bullet(
DisplayManager& manager,
const Vector& pos, float xm, int dir,
+ Bullet(const Vector& pos, float xm, int dir,
int kind);
virtual void action(float frame_ratio);
int kind);
virtual void action(float frame_ratio);
- virtual void draw(
Camera& viewport, int layer
);
+ virtual void draw(
DrawingContext& context
);
void collision(int c_object);
virtual void collision(const MovingObject& other_object, int type);
void collision(int c_object);
virtual void collision(const MovingObject& other_object, int type);