summaryrefslogtreecommitdiff
path: root/src/openttd.cpp
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-07-03 13:28:15 +0000
committeryexo <yexo@openttd.org>2010-07-03 13:28:15 +0000
commit258ca288197f60cfec79af7ea3a27805e6147c18 (patch)
treef3bd2c6f039f3f5545da9acc669e64fa4f676117 /src/openttd.cpp
parentd1044c036a1321d377dfe0a79ed5d39888bfd3d1 (diff)
downloadopenttd-258ca288197f60cfec79af7ea3a27805e6147c18.tar.xz
(svn r20055) -Feature: save/load hotkeys to/from hotkeys.cfg
Diffstat (limited to 'src/openttd.cpp')
-rw-r--r--src/openttd.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 2fe662fb0..1674b7d65 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -66,6 +66,7 @@
#include "core/random_func.hpp"
#include "rail_gui.h"
#include "core/backup_type.hpp"
+#include "hotkeys.h"
#include "newgrf_commons.h"
@@ -575,6 +576,7 @@ int ttd_main(int argc, char *argv[])
AI::Uninitialize(true);
CheckConfig();
LoadFromHighScore();
+ LoadHotkeysFromConfig();
if (resolution.width != 0) { _cur_resolution = resolution; }
if (startyear != INVALID_YEAR) _settings_newgame.game_creation.starting_year = startyear;
@@ -758,6 +760,7 @@ int ttd_main(int argc, char *argv[])
/* only save config if we have to */
if (save_config) {
SaveToConfig();
+ SaveHotkeysToConfig();
SaveToHighScore();
}