ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #1797

Browse Source 
Don't give a bomb in case of time trial.
This commit is contained in:
Benau 2016-04-16 08:15:18 +08:00
parent 58846002eb
commit caca4b06b2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/items/attachment.cpp
View File

@ -285,7 +285,12 @@ void Attachment::hitBanana(Item *item, int new_attachment)
m_kart->playCustomSFX(SFXManager::CUSTOM_ATTACH);
if(new_attachment==-1)
new_attachment = m_random.get(3);
{
if(race_manager->getMinorMode() == RaceManager::MINOR_MODE_TIME_TRIAL)
new_attachment = m_random.get(2);
else
new_attachment = m_random.get(3);
}
} // switch
if (add_a_new_item)
@ -301,12 +306,6 @@ void Attachment::hitBanana(Item *item, int new_attachment)
if(m_initial_speed <= 1.5) m_initial_speed = 1.5;
break ;
case 1:
set( ATTACH_BOMB, stk_config->m_bomb_time+leftover_time);
// if ( m_kart == m_kart[0] )
// sound -> playSfx ( SOUND_SHOOMF ) ;
break ;
case 2:
set(ATTACH_ANVIL, kp->getAnvilDuration() + leftover_time);
// if ( m_kart == m_kart[0] )
// sound -> playSfx ( SOUND_SHOOMF ) ;
@ -315,6 +314,12 @@ void Attachment::hitBanana(Item *item, int new_attachment)
m_kart->adjustSpeed(kp->getAnvilSpeedFactor());
m_kart->updateWeight();
break ;
case 2:
set( ATTACH_BOMB, stk_config->m_bomb_time+leftover_time);
// if ( m_kart == m_kart[0] )
// sound -> playSfx ( SOUND_SHOOMF ) ;
break ;
} // switch
}
} // hitBanana