diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-14 20:44:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 20:44:55 +0100 |
| commit | 61a693cf782c952dc151d8d77b1ab365888e6701 (patch) | |
| tree | f6e629e3b1a4546105edcd0ea9a5bb130b9198f0 /servers | |
| parent | 04edfc090b0e78f4f820977da8cb4eb2d015c5f7 (diff) | |
| parent | acb23adad37b459e64b8f9bafbbdd1185d46093d (diff) | |
Merge pull request #12922 from eska014/engine-singletons
Singleton management changes
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/register_server_types.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index 1ba9e7b174..99493afc40 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "register_server_types.h" +#include "engine.h" #include "project_settings.h" #include "arvr/arvr_interface.h" @@ -171,9 +172,9 @@ void unregister_server_types() { } void register_server_singletons() { - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("VisualServer", VisualServer::get_singleton())); - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("AudioServer", AudioServer::get_singleton())); - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("PhysicsServer", PhysicsServer::get_singleton())); - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("Physics2DServer", Physics2DServer::get_singleton())); - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("ARVRServer", ARVRServer::get_singleton())); + Engine::get_singleton()->add_singleton(Engine::Singleton("VisualServer", VisualServer::get_singleton())); + Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton())); + Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton())); + Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton())); + Engine::get_singleton()->add_singleton(Engine::Singleton("ARVRServer", ARVRServer::get_singleton())); } |