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

Revert "Do not compute the battle graph in case of a single kart in debug"

Browse Source 
since Benau has suggested a better approach.
This reverts commit c9c37fb4003ba82f3814765f5f5ecdf7735734c2.
This commit is contained in:
hiker 2016-04-28 16:58:37 +10:00
parent fdf2df2f0f
commit b83246aac2
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modes/three_strikes_battle.cpp
View File

@ -453,18 +453,10 @@ void ThreeStrikesBattle::updateKartNodes()
{
if (m_karts[i]->isEliminated()) continue;
#ifdef DEBUG
// Battle map not loaded in debug mode with a single kart
// since the graph creation is very expensive.
if(race_manager->getNumberOfKarts()>1)
#endif
{
m_kart_info[i].m_on_node = BattleGraph::get()
->pointToNode(m_kart_info[i].m_on_node,
m_karts[i]->getXYZ(),
false/*ignore_vertical*/);
m_karts[i]->getXYZ(), false/*ignore_vertical*/);
}
} // for i < n
}
//-----------------------------------------------------------------------------

8
src/states_screens/race_gui.cpp
View File

@ -335,14 +335,6 @@ void RaceGUI::drawGlobalTimer()
*/
void RaceGUI::drawGlobalMiniMap()
{
#ifdef DEBUG
// Battle map not loaded in debug mode with a single kart due to slowness
if(race_manager->getNumberOfKarts()==1 &&
( World::getWorld()->getTrack()->isArena() ||
World::getWorld()->getTrack()->isSoccer() ) )
return;
#endif
World *world = World::getWorld();
// draw a map when arena has a navigation mesh.
if ((world->getTrack()->isArena() || world->getTrack()->isSoccer()) &&

18
src/tracks/track.cpp
View File

@ -671,14 +671,6 @@ void Track::startMusic() const
*/
void Track::loadBattleGraph()
{
#ifdef DEBUG
// This must be a testing race with just one player. Do not load the
// battle graph since it can be VERY slow in debug mode - temple
// needs in the order of minutes.
if(race_manager->getNumberOfKarts()==1)
return;
#endif
BattleGraph::create(m_root+"navmesh.xml");
if(BattleGraph::get()->getNumNodes()==0)
@ -1878,16 +1870,8 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
delete root;
#ifdef DEBUG
// Don't use battle graph in debug mode with a single kart (i.e. testing
// only). Loading can be VERY slow.
if(race_manager->getNumberOfKarts()>1)
#endif
{
if ((m_is_arena || m_is_soccer) && !m_is_cutscene && m_has_navmesh &&
!arena_random_item_created )
if ((m_is_arena || m_is_soccer) && !m_is_cutscene && m_has_navmesh && !arena_random_item_created)
BattleGraph::get()->findItemsOnGraphNodes();
}
if (UserConfigParams::m_track_debug &&
race_manager->getMinorMode()!=RaceManager::MINOR_MODE_3_STRIKES &&