diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-24 23:33:32 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-24 23:33:32 (GMT) |
| commit | 35858ef6073092f8447bbec8b18b768061cf8bd0 (patch) | |
| tree | 1ad7e7e9272f6a640289bc422ebe7d34fe025bf0 /src/PowderToy.cpp | |
| parent | 04e4a2346d3d7ef6e0f0b38d8eafc928dc6e30bd (diff) | |
| download | powder-35858ef6073092f8447bbec8b18b768061cf8bd0.zip powder-35858ef6073092f8447bbec8b18b768061cf8bd0.tar.gz | |
Fix textbox
Diffstat (limited to 'src/PowderToy.cpp')
| -rw-r--r-- | src/PowderToy.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/PowderToy.cpp b/src/PowderToy.cpp index 0d3c75c..c7b6da0 100644 --- a/src/PowderToy.cpp +++ b/src/PowderToy.cpp @@ -32,6 +32,7 @@ SDL_Surface * SDLOpen() fprintf(stderr, "Initializing SDL: %s\n", SDL_GetError()); return 0; } + SDL_EnableUNICODE(1); #if defined(WIN32) && defined(WINCONSOLE) //On Windows, SDL redirects stdout to stdout.txt, which can be annoying when debugging, here we redirect back to the console if (console) @@ -84,7 +85,7 @@ int main(int argc, char * argv[]) engine->Exit(); break; case SDL_KEYDOWN: - engine->onKeyPress(event.key.keysym.sym, false, false, false); + engine->onKeyPress(event.key.keysym.unicode, false, false, false); break; case SDL_KEYUP: break; @@ -133,7 +134,14 @@ int main(int argc, char * argv[]) fps = (((float)currentFrame)/((float)elapsedTime))*1000.0f; currentFrame = 0; lastTime = currentTime; - delta = 60.0f/fps; + if(ui::Engine::Ref().FpsLimit > 2.0f) + { + delta = ui::Engine::Ref().FpsLimit/fps; + } + else + { + delta = 1.0f; + } } } ui::Engine::Ref().CloseWindow(); |