diff --git a/source/platform/pfgen.cpp b/source/platform/pfgen.cpp index 92ed8f99d..12ed7522c 100644 --- a/source/platform/pfgen.cpp +++ b/source/platform/pfgen.cpp @@ -49,7 +49,15 @@ void CNpcFallingPlatformGenerator::think( int _frames ) if ( m_timer < 0 ) { - m_timer = ( 3 * GameState::getOneSecondInFrames() ) + ( getRnd() % ( ( m_data[m_type].initTimer - 1 ) * GameState::getOneSecondInFrames() ) ); + s32 second = GameState::getOneSecondInFrames(); + + m_timer = second; + + m_timer += m_data[m_type].initTimer * second; + + m_timer += second - ( getRnd() % ( 2 * second ) ); + + //m_timer = ( 3 * GameState::getOneSecondInFrames() ) + ( getRnd() % ( ( m_data[m_type].initTimer - 1 ) * GameState::getOneSecondInFrames() ) ); // generate new falling platform diff --git a/source/platform/platdata.cpp b/source/platform/platdata.cpp index 1b0851bbc..a87448b2e 100644 --- a/source/platform/platdata.cpp +++ b/source/platform/platdata.cpp @@ -179,7 +179,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] = }, { // NPC_OILDRUM_PLATFORM - 2, + 1, 128, true, DAMAGE__NONE, @@ -191,7 +191,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] = }, { // NPC_CRATE_PLATFORM - 3, + 1, 128, true, DAMAGE__NONE, @@ -239,7 +239,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] = }, { // NPC_CRATE_GENERATOR - 3, + 2, 128, true, DAMAGE__NONE, @@ -275,7 +275,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] = }, { // NPC_VERTICAL_OILDRUM_PLATFORM - 2, + 1, 128, true, DAMAGE__NONE,