summaryrefslogtreecommitdiff
path: root/src/PowderToy.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
commit857b0cc1fc58f066acd59404d16ee5e566e20f00 (patch)
tree7607fc43f3bdd63687dff39209f44defa48e6a35 /src/PowderToy.cpp
parent1d297cb57a338f2a9e34d0f16642afc6a83c1041 (diff)
downloadpowder-857b0cc1fc58f066acd59404d16ee5e566e20f00.zip
powder-857b0cc1fc58f066acd59404d16ee5e566e20f00.tar.gz
Load user information from preferences, fps display for testing
Diffstat (limited to 'src/PowderToy.cpp')
-rw-r--r--src/PowderToy.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/PowderToy.cpp b/src/PowderToy.cpp
index a64270f..1886bde 100644
--- a/src/PowderToy.cpp
+++ b/src/PowderToy.cpp
@@ -73,6 +73,7 @@ SDL_Surface * SDLOpen()
#endif
SDL_WM_SetCaption("The Powder Toy", "Powder Toy");
+ SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
atexit(SDL_Quit);
return SDL_SetVideoMode(XRES + BARSIZE, YRES + MENUSIZE, 32, SDL_SWSURFACE);
}
@@ -148,7 +149,7 @@ int main(int argc, char * argv[])
event.type = 0; //Clear last event
}
- engine->Tick(delta);
+ engine->Tick();
engine->Draw();
currentFrame++;
@@ -177,6 +178,7 @@ int main(int argc, char * argv[])
delta = 1.0f;
}
}
+ engine->SetFps(fps);
}
ui::Engine::Ref().CloseWindow();
delete gameController;