summaryrefslogtreecommitdiff
path: root/main/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main/main.cpp')
-rw-r--r--main/main.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index fba7a781bf..2e30ed298a 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -688,7 +688,10 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
#endif
- input_map->load_from_globals();
+ if (editor)
+ input_map->load_default(); //keys for editor
+ else
+ input_map->load_from_globals(); //keys for game
if (video_driver=="") // specified in engine.cfg
video_driver=_GLOBAL_DEF("display/driver",Variant((const char*)OS::get_singleton()->get_video_driver_name(0)));