diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/SCsub | 2 | ||||
| -rw-r--r-- | main/main.cpp | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/main/SCsub b/main/SCsub index 7b51b06187..795c427c8d 100644 --- a/main/SCsub +++ b/main/SCsub @@ -5,7 +5,7 @@ env.add_source_files(env.main_sources,"*.cpp") Export('env') -lib = env.Library("main",env.main_sources, LIBSUFFIX=env['platform_libsuffix']) +lib = env.Library("main",env.main_sources) env.Prepend(LIBS=[lib]) diff --git a/main/main.cpp b/main/main.cpp index 2d286759d9..fa7ce50c6d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -43,7 +43,7 @@ #include "io/resource_loader.h" #include "scene/main/scene_main_loop.h" -#include "scene/io/scene_loader.h" + #include "script_language.h" #include "io/resource_loader.h" @@ -1131,10 +1131,6 @@ bool Main::start() { #ifdef TOOLS_ENABLED if (editor) { -#ifdef OLD_SCENE_FORMAT_ENABLED - if (convert_old) - editor_node->set_convert_old_scene(true); -#endif if (_import!="") { @@ -1214,14 +1210,6 @@ bool Main::start() { if (scenedata.is_valid()) scene=scenedata->instance(); -#ifdef OLD_SCENE_FORMAT_ENABLED - - if (!scene) { - scene = SceneLoader::load(local_game_path,true); - } - -#endif - ERR_EXPLAIN("Failed loading scene: "+local_game_path); ERR_FAIL_COND_V(!scene,false) sml->get_root()->add_child(scene); |