diff options
| author | Leon Krause <lk@leonkrause.com> | 2017-11-13 21:46:57 +0100 |
|---|---|---|
| committer | Leon Krause <lk@leonkrause.com> | 2017-11-14 15:15:13 +0100 |
| commit | 9b7b46143d2df7d4f2efcb89ceb5034c7a57e79c (patch) | |
| tree | 8ceadc6a5891c5f3205b0e23d5b7dd6ef3d40e1f /platform/javascript | |
| parent | 3732b2318e8a4942e8202f1797527220a5ae01a0 (diff) | |
Move singleton management from ProjectSettings to Engine
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 389d5d206e..77d81aec5d 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "os_javascript.h" +#include "core/engine.h" #include "core/io/file_access_buffered_fa.h" -#include "core/project_settings.h" #include "dom_keys.h" #include "drivers/gles3/rasterizer_gles3.h" #include "drivers/unix/dir_access_unix.h" @@ -514,7 +514,7 @@ void OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, i #ifdef JAVASCRIPT_EVAL_ENABLED javascript_eval = memnew(JavaScript); - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("JavaScript", javascript_eval)); + Engine::get_singleton()->add_singleton(Engine::Singleton("JavaScript", javascript_eval)); #endif visual_server->init(); @@ -896,7 +896,6 @@ String OS_JavaScript::get_data_dir() const { return get_data_dir_func(); */ return "/userfs"; - //return ProjectSettings::get_singleton()->get_singleton_object("GodotOS")->call("get_data_dir"); }; String OS_JavaScript::get_executable_path() const { |