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

No questiuon mark for minimap when RTT is down

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8881 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2011-06-12 00:04:53 +00:00
parent e9edb9655b
commit 561e40a9ed
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/states_screens/minimal_race_gui.cpp
View File

@@ -280,16 +280,19 @@ void MinimalRaceGUI::drawGlobalMiniMap()
// arenas currently don't have a map.
if(world->getTrack()->isArena()) return;
const video::ITexture *mini_map=world->getTrack()->getMiniMap();
const video::ITexture *mini_map = world->getTrack()->getMiniMap();
int upper_y = m_map_bottom-m_map_height;
int upper_y = m_map_bottom - m_map_height;
int lower_y = m_map_bottom;
core::rect<s32> dest(m_map_left, upper_y,
m_map_left + m_map_width, lower_y);
core::rect<s32> source(core::position2di(0, 0), mini_map->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(mini_map, dest, source, 0, 0, true);
if (mini_map != NULL)
{
core::rect<s32> dest(m_map_left, upper_y,
m_map_left + m_map_width, lower_y);
core::rect<s32> source(core::position2di(0, 0), mini_map->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(mini_map, dest, source, 0, 0, true);
}
// In the first iteration, only draw AI karts, then only draw
// player karts. This guarantees that player kart icons are always
// on top of AI kart icons.

19
src/states_screens/race_gui.cpp
View File

@@ -271,16 +271,19 @@ void RaceGUI::drawGlobalMiniMap()
// arenas currently don't have a map.
if(world->getTrack()->isArena()) return;
const video::ITexture *mini_map=world->getTrack()->getMiniMap();
const video::ITexture *mini_map = world->getTrack()->getMiniMap();
int upper_y = UserConfigParams::m_height-m_map_bottom-m_map_height;
int lower_y = UserConfigParams::m_height-m_map_bottom;
int upper_y = UserConfigParams::m_height - m_map_bottom - m_map_height;
int lower_y = UserConfigParams::m_height - m_map_bottom;
if (mini_map != NULL)
{
core::rect<s32> dest(m_map_left, upper_y,
m_map_left + m_map_width, lower_y);
core::rect<s32> source(core::position2di(0, 0), mini_map->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(mini_map, dest, source, 0, 0, true);
}
core::rect<s32> dest(m_map_left, upper_y,
m_map_left + m_map_width, lower_y);
core::rect<s32> source(core::position2di(0, 0), mini_map->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(mini_map, dest, source, 0, 0, true);
for(unsigned int i=0; i<world->getNumKarts(); i++)
{
const Kart *kart = world->getKart(i);

1
src/tracks/quad_graph.cpp
View File

@@ -720,7 +720,6 @@ video::ITexture *QuadGraph::makeMiniMap(const core::dimension2du &dimension,
{
fprintf(stderr, "[QuadGraph::makeMiniMap] WARNING: RTT does not appear to work,"
"mini-map will not be available\n");
texture = irr_driver->getTexture(file_manager->getDataDir() + "/gui/main_help.png");
}
return texture;