diff options
| author | Rémi Verschelde | 2017-11-14 20:44:55 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-14 20:44:55 +0100 |
| commit | 61a693cf782c952dc151d8d77b1ab365888e6701 (patch) | |
| tree | f6e629e3b1a4546105edcd0ea9a5bb130b9198f0 /platform/javascript/os_javascript.cpp | |
| parent | 04edfc090b0e78f4f820977da8cb4eb2d015c5f7 (diff) | |
| parent | acb23adad37b459e64b8f9bafbbdd1185d46093d (diff) | |
| download | godot-61a693cf782c952dc151d8d77b1ab365888e6701.tar.gz godot-61a693cf782c952dc151d8d77b1ab365888e6701.tar.zst godot-61a693cf782c952dc151d8d77b1ab365888e6701.zip | |
Merge pull request #12922 from eska014/engine-singletons
Singleton management changes
Diffstat (limited to 'platform/javascript/os_javascript.cpp')
| -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 389d5d206..77d81aec5 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 { |