diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index a45d60b7b..9934d1cd2 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -244,6 +244,48 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] = 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 ACTORS_CLAM_SBK, ANIM_CLAM_SIDESNAP, diff --git a/source/player/player.cpp b/source/player/player.cpp index 5565d3f28..6539f8c8f 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -533,6 +533,17 @@ int CPlayer::getHeightFromGround(int _x,int _y,int _maxHeight) return height; } +/*---------------------------------------------------------------------- + Function: + Purpose: + Params: + Returns: + ---------------------------------------------------------------------- */ +int CPlayer::getHeightFromGroundNoPlatform(int _x,int _y,int _maxHeight=32) +{ + return( m_layerCollision->getHeightFromGround(_x,_y,_maxHeight) ); +} + /*---------------------------------------------------------------------- Function: Purpose: diff --git a/source/player/player.h b/source/player/player.h index 6e5230b46..1b49846c1 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -149,6 +149,7 @@ public: void setRespawnPos(DVECTOR _respawn) {m_respawnPos=_respawn;} int getHeightFromGround(int _x,int _y,int _maxHeight=32); + int getHeightFromGroundNoPlatform(int _x,int _y,int _maxHeight=32); void addHealth(int _health); void addLife();