diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/game.cpp | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | mv-stripped1.1.10.16.tar.gz mv-stripped1.1.10.16.tar.bz2 mv-stripped1.1.10.16.tar.xz mv-stripped1.1.10.16.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp index 0527e8481..6ed2c2239 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -568,6 +568,7 @@ void Game::logic() map->saveExtraLayer(); } Client::closeDialogs(); + Client::setFramerate(config.getIntValue("fpslimit")); disconnectedDialog = new OkDialog(_("Network Error"), errorMessage, false); disconnectedDialog->addActionListener(&errorListener); |