Removed unused functions.

This commit is contained in:
hiker 2016-12-09 16:39:37 +11:00
parent a8d3b6b0df
commit 0a2ea4bd08
2 changed files with 0 additions and 18 deletions

View File

@ -129,7 +129,6 @@ World::World() : WorldStatus(), m_clear_color(255,100,101,140)
m_schedule_pause = false; m_schedule_pause = false;
m_schedule_unpause = false; m_schedule_unpause = false;
m_schedule_exit_race = false; m_schedule_exit_race = false;
m_self_destruct = false;
m_schedule_tutorial = false; m_schedule_tutorial = false;
m_is_network_world = false; m_is_network_world = false;
m_weather = NULL; m_weather = NULL;
@ -840,12 +839,6 @@ void World::updateWorld(float dt)
m_schedule_unpause = false; m_schedule_unpause = false;
} }
if (m_self_destruct)
{
delete this;
return;
}
// Don't update world if a menu is shown or the race is over. // Don't update world if a menu is shown or the race is over.
if( getPhase() == FINISH_PHASE || if( getPhase() == FINISH_PHASE ||
getPhase() == IN_GAME_MENU_PHASE ) getPhase() == IN_GAME_MENU_PHASE )
@ -1276,15 +1269,6 @@ void World::unpause()
} }
} // pause } // pause
//-----------------------------------------------------------------------------
/** Call when the world needs to be deleted but you can't do it immediately
* because you are e.g. within World::update()
*/
void World::delayedSelfDestruct()
{
m_self_destruct = true;
} // delayedSelfDestruct
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void World::escapePressed() void World::escapePressed()
{ {

View File

@ -357,8 +357,6 @@ public:
* quadgraph. Override to change value. */ * quadgraph. Override to change value. */
virtual bool useChecklineRequirements() const { return false; } virtual bool useChecklineRequirements() const { return false; }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
void delayedSelfDestruct();
// ------------------------------------------------------------------------
virtual void escapePressed(); virtual void escapePressed();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
virtual void loadCustomModels() {} virtual void loadCustomModels() {}