Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-04-07 19:52:45 +00:00
parent 5901bd4aba
commit 864f9af76b
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source/enemy/npcdata.cpp
View File

@ -244,6 +244,48 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
NPC_PLATFORM_TIMER_GEYSER, NPC_PLATFORM_TIMER_GEYSER,
}, },
{ // NPC_BOBBING_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_PLATFORM_MOVEMENT_BOB,
0,
128,
true,
DAMAGE__NONE,
0,
NPC_PLATFORM_INFINITE_LIFE,
4,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_FALLING_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_PLATFORM_MOVEMENT_FALL,
4,
128,
true,
DAMAGE__NONE,
0,
NPC_PLATFORM_INFINITE_LIFE,
4,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_CART_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_PLATFORM_MOVEMENT_CART,
4,
128,
true,
DAMAGE__NONE,
0,
NPC_PLATFORM_INFINITE_LIFE,
4,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_PLAYER_BUBBLE_PLATFORM { // NPC_PLAYER_BUBBLE_PLATFORM
ACTORS_CLAM_SBK, ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP, ANIM_CLAM_SIDESNAP,

11
source/player/player.cpp
View File

@ -533,6 +533,17 @@ int CPlayer::getHeightFromGround(int _x,int _y,int _maxHeight)
return height; return height;
} }
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
int CPlayer::getHeightFromGroundNoPlatform(int _x,int _y,int _maxHeight=32)
{
return( m_layerCollision->getHeightFromGround(_x,_y,_maxHeight) );
}
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
Function: Function:
Purpose: Purpose:

1
source/player/player.h
View File

@ -149,6 +149,7 @@ public:
void setRespawnPos(DVECTOR _respawn) {m_respawnPos=_respawn;} void setRespawnPos(DVECTOR _respawn) {m_respawnPos=_respawn;}
int getHeightFromGround(int _x,int _y,int _maxHeight=32); int getHeightFromGround(int _x,int _y,int _maxHeight=32);
int getHeightFromGroundNoPlatform(int _x,int _y,int _maxHeight=32);
void addHealth(int _health); void addHealth(int _health);
void addLife(); void addLife();