This commit is contained in:
parent
d26f36461e
commit
293ce2cc9a
12 changed files with 140 additions and 73 deletions
|
@ -49,7 +49,7 @@
|
|||
typedef enum
|
||||
{
|
||||
PLAYER_MODE_BASICUNARMED,
|
||||
// PLAYER_MODE_FULLUNARMED,
|
||||
PLAYER_MODE_FULLUNARMED,
|
||||
PLAYER_MODE_BALLOON,
|
||||
//PLAYER_MODE_BUBBLE_MIXTURE,
|
||||
//PLAYER_MODE_HELMET,
|
||||
|
@ -57,6 +57,8 @@ typedef enum
|
|||
// PLAYER_MODE_CORALBLOWER,
|
||||
//PLAYER_MODE_JELLY_LAUNCHER,
|
||||
|
||||
PLAYER_MODE_DEAD,
|
||||
|
||||
PLAYER_MODE_FLY,
|
||||
|
||||
NUM_PLAYERMODES,
|
||||
|
@ -163,10 +165,8 @@ public:
|
|||
PLAYERINPUT getPadInputDown() {return m_padInputDown;}
|
||||
class CLayerCollision *getLayerCollision() {return m_layerCollision;}
|
||||
|
||||
|
||||
void takeDamage(DAMAGE_TYPE _damage);
|
||||
|
||||
private:
|
||||
void respawn();
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue