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

Restrict X movement of plunger, fixed plunger always moving right.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11808 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2012-10-28 23:43:29 +00:00
parent 50a99ee486
commit 24e396cb72
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/states_screens/race_gui_base.cpp
View File

@@ -1043,7 +1043,10 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
m_plunger_offset = core::vector2di(0,0);
m_plunger_state = PLUNGER_STATE_NOMOVE;
m_plunger_speed = core::vector2df(0, 0);
m_plunger_x_target = random.get(screen_width)- screen_width/2;
float movement_fraction = 0.3f;
m_plunger_x_target = screen_width/2
+ random.get((int)(screen_width*movement_fraction))
- (int)(screen_width*movement_fraction*0.5f);
}
m_plunger_move_time -= dt;
@@ -1053,9 +1056,9 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
if(kart->getBlockedByPlungerTime()<fast_time)
{
m_plunger_state = PLUNGER_STATE_FAST;
m_plunger_speed = core::vector2df(m_plunger_x_target/fast_time,
viewport.getHeight()*0.5f
/fast_time);
m_plunger_speed =
core::vector2df((m_plunger_x_target-screen_width/2)/fast_time,
viewport.getHeight()*0.5f/fast_time);
m_plunger_move_time = fast_time;
}
else
@@ -1074,7 +1077,7 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
{
m_plunger_state = PLUNGER_STATE_NOMOVE;
m_plunger_speed =
core::vector2df(0, 0.10f*viewport.getHeight()
core::vector2df(0, 0.02f*viewport.getHeight()
/m_plunger_move_time );
}
} // has not reach fast moving state