diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-02-01 11:07:34 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-02-01 11:07:34 +0100 |
| commit | 7439947e139a01b7f05a3c25e935caef8a1f801c (patch) | |
| tree | 411ddee59c9d1482ffc604a250f6056e131091d0 | |
| parent | 11933811eec441f9ac517a044d8281d897833093 (diff) | |
| parent | 51dfd4a4b59aa0549eb8a324aca6480df8ae4ed0 (diff) | |
Merge pull request #3518 from Ovnuniarchos/3DSoundServerBadReg
Variables SpatialSoundServer and SS pointed to SpatialSound2DServer.
| -rw-r--r-- | doc/base/classes.xml | 4 | ||||
| -rw-r--r-- | servers/register_server_types.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index e642430636..13bc5a91e6 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -681,9 +681,9 @@ </member> <member name="PS2D" type="Physics2DServer"> </member> - <member name="SpatialSoundServer" type="SpatialSound2DServer"> + <member name="SpatialSoundServer" type="SpatialSoundServer"> </member> - <member name="SS" type="SpatialSound2DServer"> + <member name="SS" type="SpatialSoundServer"> </member> <member name="SpatialSound2DServer" type="SpatialSound2DServer"> </member> diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index 4752210b5f..06eaa4d122 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -65,8 +65,8 @@ void register_server_types() { Globals::get_singleton()->add_singleton( Globals::Singleton("PS",PhysicsServer::get_singleton()) ); Globals::get_singleton()->add_singleton( Globals::Singleton("Physics2DServer",Physics2DServer::get_singleton()) ); Globals::get_singleton()->add_singleton( Globals::Singleton("PS2D",Physics2DServer::get_singleton()) ); - Globals::get_singleton()->add_singleton( Globals::Singleton("SpatialSoundServer",SpatialSound2DServer::get_singleton()) ); - Globals::get_singleton()->add_singleton( Globals::Singleton("SS",SpatialSound2DServer::get_singleton()) ); + Globals::get_singleton()->add_singleton( Globals::Singleton("SpatialSoundServer",SpatialSoundServer::get_singleton()) ); + Globals::get_singleton()->add_singleton( Globals::Singleton("SS",SpatialSoundServer::get_singleton()) ); Globals::get_singleton()->add_singleton( Globals::Singleton("SpatialSound2DServer",SpatialSound2DServer::get_singleton()) ); Globals::get_singleton()->add_singleton( Globals::Singleton("SS2D",SpatialSound2DServer::get_singleton()) ); |