Minor cleanups.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1359 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
626474e079
commit
af042fff54
@ -64,13 +64,10 @@ void GameManager::run()
|
||||
material_manager->getMaterial("st_title_screen.rgb")->getIndex();
|
||||
while(!m_abort)
|
||||
{
|
||||
// Run input processing.
|
||||
// FIXME: rename this to sdl_input or something.
|
||||
drv_loop();
|
||||
sdl_input();
|
||||
|
||||
// Now the screen may have changed and
|
||||
// needs to be updated.
|
||||
|
||||
if(m_started) m_prev_time = m_curr_time;
|
||||
else
|
||||
{
|
||||
|
@ -248,7 +248,7 @@ void input(InputType type, int id0, int id1, int id2, int value)
|
||||
* flexibility (= treat 4 directions as four buttons).
|
||||
*
|
||||
*/
|
||||
void drv_loop()
|
||||
void sdl_input()
|
||||
{
|
||||
SDL_Event ev;
|
||||
|
||||
|
@ -50,7 +50,7 @@ void drv_deinit();
|
||||
void drv_toggleFullscreen(bool resetTextures=1);
|
||||
void setVideoMode(bool resetTextures=1);
|
||||
|
||||
void drv_loop();
|
||||
void sdl_input();
|
||||
|
||||
void drv_setMode(InputDriverMode);
|
||||
bool drv_isInMode(InputDriverMode);
|
||||
|
@ -261,11 +261,6 @@ void World::resetAllKarts()
|
||||
#endif
|
||||
} // resetAllKarts
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void World::draw()
|
||||
{
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void World::update(float dt)
|
||||
{
|
||||
@ -273,7 +268,7 @@ void World::update(float dt)
|
||||
|
||||
checkRaceStatus();
|
||||
// this line was before checkRaceStatus. but m_clock is set to 0.0 in
|
||||
// checkRaceStatus on start, so m_clock would not be synchron and the
|
||||
// checkRaceStatus on start, so m_clock would not be synchronized and the
|
||||
// first delta would not be added .. that would cause a gap in
|
||||
// replay-recording
|
||||
m_clock += dt;
|
||||
|
@ -75,7 +75,6 @@ public:
|
||||
{return m_track->GetHOT(start, end, leaf, nrm);}
|
||||
int Collision(sgSphere* s, AllHits *a) const {return m_track->Collision(s,a); }
|
||||
#endif
|
||||
void draw();
|
||||
void update(float delta);
|
||||
void restartRace();
|
||||
void disableRace(); // Put race into limbo phase
|
||||
|
Loading…
x
Reference in New Issue
Block a user