This commit is contained in:
parent
66331fd831
commit
7199c4545c
2 changed files with 13 additions and 5 deletions
|
@ -49,7 +49,15 @@ void CNpcFallingPlatformGenerator::think( int _frames )
|
||||||
|
|
||||||
if ( m_timer < 0 )
|
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
|
// generate new falling platform
|
||||||
|
|
||||||
|
|
|
@ -179,7 +179,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // NPC_OILDRUM_PLATFORM
|
{ // NPC_OILDRUM_PLATFORM
|
||||||
2,
|
1,
|
||||||
128,
|
128,
|
||||||
true,
|
true,
|
||||||
DAMAGE__NONE,
|
DAMAGE__NONE,
|
||||||
|
@ -191,7 +191,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // NPC_CRATE_PLATFORM
|
{ // NPC_CRATE_PLATFORM
|
||||||
3,
|
1,
|
||||||
128,
|
128,
|
||||||
true,
|
true,
|
||||||
DAMAGE__NONE,
|
DAMAGE__NONE,
|
||||||
|
@ -239,7 +239,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // NPC_CRATE_GENERATOR
|
{ // NPC_CRATE_GENERATOR
|
||||||
3,
|
2,
|
||||||
128,
|
128,
|
||||||
true,
|
true,
|
||||||
DAMAGE__NONE,
|
DAMAGE__NONE,
|
||||||
|
@ -275,7 +275,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // NPC_VERTICAL_OILDRUM_PLATFORM
|
{ // NPC_VERTICAL_OILDRUM_PLATFORM
|
||||||
2,
|
1,
|
||||||
128,
|
128,
|
||||||
true,
|
true,
|
||||||
DAMAGE__NONE,
|
DAMAGE__NONE,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue