diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-25 21:55:59 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-25 21:57:08 -0300 |
| commit | 96de0141ccef3bb035574010816dafdbfc17eb63 (patch) | |
| tree | 24bcad418177b4aba1a24d959a50ff401028f0ea /main | |
| parent | ae258e2679bd9deda8b311d030771fab03303833 (diff) | |
Removed import/export system, will start new one from scratch.
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/main/main.cpp b/main/main.cpp index 22223fe2c4..6dde1e521c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -38,7 +38,7 @@ #include "script_debugger_local.h" #include "script_debugger_remote.h" #include "message_queue.h" -#include "path_remap.h" + #include "input_map.h" #include "io/resource_loader.h" #include "scene/main/scene_main_loop.h" @@ -85,7 +85,7 @@ AudioServer *audio_server=NULL; static MessageQueue *message_queue=NULL; static Performance *performance = NULL; -static PathRemap *path_remap; + static PackedData *packed_data=NULL; #ifdef MINIZIP_ENABLED static ZipArchive *zip_packed_data=NULL; @@ -215,7 +215,6 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas register_core_settings(); //here globals is present - path_remap = memnew( PathRemap ); translation_server = memnew( TranslationServer ); performance = memnew( Performance ); globals->add_singleton(GlobalConfig::Singleton("Performance",performance)); @@ -874,8 +873,6 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas memdelete(packed_data); if (file_access_network_client) memdelete(file_access_network_client); - if(path_remap) - memdelete(path_remap); // Note 1: *zip_packed_data live into *packed_data // Note 2: PackedData::~PackedData destroy this. @@ -935,8 +932,6 @@ Error Main::setup2() { } MAIN_PRINT("Main: Load Remaps"); - path_remap->load_remaps(); - Color clear = GLOBAL_DEF("rendering/viewport/default_clear_color",Color(0.3,0.3,0.3)); VisualServer::get_singleton()->set_default_clear_color(clear); @@ -1791,8 +1786,6 @@ void Main::cleanup() { memdelete(input_map); if (translation_server) memdelete( translation_server ); - if (path_remap) - memdelete(path_remap); if (globals) memdelete(globals); if (engine) |