summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-01-13 22:38:37 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-01-13 22:38:43 +0100
commitf19fd7a4c1b95d7552f186110c2e7ae8dcbc6ccc (patch)
tree7562c6e5931eb39962767b2f335599967c773054 /main
parentf392b340ffa832f5395e01ff5d96ae553d0983d6 (diff)
Reenable node name case setting + code cleanups
The method _generate_serial_child_name is indeed called relatively often in editor mode, but that commented out code chunk hardly adds to its slowness (and with the default setting, not at all). Also did various related code cleanups and simplifications.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index a6fff517bd..fa5fee782c 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -711,7 +711,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
input_map->load_from_globals(); //keys for game
if (video_driver=="") // specified in engine.cfg
- video_driver=_GLOBAL_DEF("display/driver/name",Variant((const char*)OS::get_singleton()->get_video_driver_name(0)));
+ video_driver=GLOBAL_DEF("display/driver/name",Variant((const char*)OS::get_singleton()->get_video_driver_name(0)));
if (!force_res && use_custom_res && globals->has("display/window/width"))
video_mode.width=globals->get("display/window/width");