Apply back fix that was committed in r4817 and mysteriously reverted in r4843, plus minor improvements to battle mode end
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
d88a8e14e9
commit
d812c0f274
@ -397,9 +397,17 @@ void RaceOverDialog::renderThreeStrikesGraph(const int x, const int y, const int
|
||||
SColor black(255,0,0,0);
|
||||
irr_driver->getVideoDriver()->draw2DLine( core::position2d<s32>(x, y),
|
||||
core::position2d<s32>(x, y + h), black);
|
||||
irr_driver->getVideoDriver()->draw2DLine( core::position2d<s32>(x, y),
|
||||
core::position2d<s32>(x - 7, y + 13), black);
|
||||
irr_driver->getVideoDriver()->draw2DLine( core::position2d<s32>(x, y),
|
||||
core::position2d<s32>(x + 7, y + 13), black);
|
||||
|
||||
irr_driver->getVideoDriver()->draw2DLine( core::position2d<s32>(x, y + h),
|
||||
core::position2d<s32>(x + w, y + h), black);
|
||||
|
||||
irr_driver->getVideoDriver()->draw2DLine( core::position2d<s32>(x + w, y + h),
|
||||
core::position2d<s32>(x + w - 13, y + h + 7), black);
|
||||
irr_driver->getVideoDriver()->draw2DLine( core::position2d<s32>(x + w, y + h),
|
||||
core::position2d<s32>(x + w - 13, y + h - 7), black);
|
||||
float lastEventTime = 0.0f;
|
||||
int max_life_count = 0;
|
||||
|
||||
|
@ -613,14 +613,14 @@ void Track::createWater(const XMLNode &node)
|
||||
*/
|
||||
void Track::loadTrackModel(unsigned int mode_id)
|
||||
{
|
||||
m_is_arena = false;
|
||||
//m_is_arena = false;
|
||||
m_track_object_manager = new TrackObjectManager();
|
||||
|
||||
// Load the graph only now: this function is called from world, after
|
||||
// the race gui was created. The race gui is needed since it stores
|
||||
// the information about the size of the texture to render the mini
|
||||
// map to.
|
||||
loadQuadGraph(mode_id);
|
||||
if (!m_is_arena) loadQuadGraph(mode_id);
|
||||
// Add the track directory to the texture search path
|
||||
file_manager->pushTextureSearchPath(m_root);
|
||||
file_manager->pushModelSearchPath (m_root);
|
||||
|
Loading…
x
Reference in New Issue
Block a user