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

Improved plunger handling when in-race menu is shown: now

Browse Source 
the plunger is also shown while the menu is on screen.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-12-01 12:14:46 +00:00
parent 87c6a98744
commit 1f0d603dbd
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/states_screens/race_gui_base.cpp
View File

@ -1030,8 +1030,6 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
m_plunger_state = PLUNGER_STATE_INIT; m_plunger_state = PLUNGER_STATE_INIT;
return; return;
} }
if(World::getWorld()->getPhase()==World::IN_GAME_MENU_PHASE)
return;
const core::recti &viewport = kart->getCamera()->getViewport(); const core::recti &viewport = kart->getCamera()->getViewport();
@ -1046,6 +1044,8 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
m_plunger_speed = core::vector2df(0, 0); m_plunger_speed = core::vector2df(0, 0);
} }
if(World::getWorld()->getPhase()!=World::IN_GAME_MENU_PHASE)
{
m_plunger_move_time -= dt; m_plunger_move_time -= dt;
if(m_plunger_move_time < dt && m_plunger_state!=PLUNGER_STATE_FAST) if(m_plunger_move_time < dt && m_plunger_state!=PLUNGER_STATE_FAST)
{ {
@ -1089,6 +1089,7 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
m_plunger_offset.X += (int)(m_plunger_speed.X * dt); m_plunger_offset.X += (int)(m_plunger_speed.X * dt);
m_plunger_offset.Y += (int)(m_plunger_speed.Y * dt); m_plunger_offset.Y += (int)(m_plunger_speed.Y * dt);
}
const int plunger_size = (int)(0.6f * screen_width); const int plunger_size = (int)(0.6f * screen_width);
int offset_y = viewport.UpperLeftCorner.Y + viewport.getHeight()/2 int offset_y = viewport.UpperLeftCorner.Y + viewport.getHeight()/2