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

Draw plunger-in-face first and not last, so messages are not hidden under the plunger

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-02-26 19:30:53 +00:00
parent c151c124cb
commit a6430189f5
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/states_screens/race_gui.cpp
View File

@ -224,6 +224,27 @@ void RaceGUI::renderPlayerView(const Kart *kart)
{
const core::recti &viewport = kart->getCamera()->getViewport();
const core::vector2df &scaling = kart->getCamera()->getScaling();
if (kart->hasViewBlockedByPlunger())
{
int offset_y = viewport.UpperLeftCorner.Y;
const int screen_width = viewport.LowerRightCorner.X - viewport.UpperLeftCorner.X;
const int plunger_size = viewport.LowerRightCorner.Y - viewport.UpperLeftCorner.Y;
int plunger_x = viewport.UpperLeftCorner.X + screen_width/2 - plunger_size/2;
video::ITexture *t=m_plunger_face->getTexture();
core::rect<s32> dest(plunger_x, offset_y,
plunger_x+plunger_size, offset_y+plunger_size);
const core::rect<s32> source(core::position2d<s32>(0,0), t->getOriginalSize());
//static const video::SColor white = video::SColor(255, 255, 255, 255);
irr_driver->getVideoDriver()->draw2DImage(t, dest, source, NULL /* clip */,
NULL /* color */, true /* alpha */);
}
drawAllMessages (kart, viewport, scaling);
if(!World::getWorld()->isRacePhase()) return;
@ -234,24 +255,6 @@ void RaceGUI::renderPlayerView(const Kart *kart)
drawSpeed (kart, viewport, scaling);
drawLap (info, kart, viewport, scaling);
if (kart->hasViewBlockedByPlunger())
{
int offset_y = viewport.UpperLeftCorner.Y;
const int screen_width = viewport.LowerRightCorner.X - viewport.UpperLeftCorner.X;
const int plunger_size = viewport.LowerRightCorner.Y - viewport.UpperLeftCorner.Y;
int plunger_x = viewport.UpperLeftCorner.X + screen_width/2 - plunger_size/2;
video::ITexture *t=m_plunger_face->getTexture();
core::rect<s32> dest(plunger_x, offset_y,
plunger_x+plunger_size, offset_y+plunger_size);
const core::rect<s32> source(core::position2d<s32>(0,0), t->getOriginalSize());
//static const video::SColor white = video::SColor(255, 255, 255, 255);
irr_driver->getVideoDriver()->draw2DImage(t, dest, source, NULL /* clip */,
NULL /* color */, true /* alpha */);
}
} // renderPlayerView
//-----------------------------------------------------------------------------