godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Merge pull request #3518 from Ovnuniarchos/3DSoundServerBadReg

Browse Source 
Variables SpatialSoundServer and SS pointed to SpatialSound2DServer.
This commit is contained in:
Rémi Verschelde
2016-02-01 11:07:34 +01:00
parent 11933811ee 51dfd4a4b5
commit 7439947e13
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/base/classes.xml
View File

@@ -681,9 +681,9 @@
</member> </member>
<member name="PS2D" type="Physics2DServer"> <member name="PS2D" type="Physics2DServer">
</member> </member>
<member name="SpatialSoundServer" type="SpatialSound2DServer"> <member name="SpatialSoundServer" type="SpatialSoundServer">
</member> </member>
<member name="SS" type="SpatialSound2DServer"> <member name="SS" type="SpatialSoundServer">
</member> </member>
<member name="SpatialSound2DServer" type="SpatialSound2DServer"> <member name="SpatialSound2DServer" type="SpatialSound2DServer">
</member> </member>

4
servers/register_server_types.cpp
View File

@@ -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("PS",PhysicsServer::get_singleton()) );
Globals::get_singleton()->add_singleton( Globals::Singleton("Physics2DServer",Physics2DServer::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("PS2D",Physics2DServer::get_singleton()) );
Globals::get_singleton()->add_singleton( Globals::Singleton("SpatialSoundServer",SpatialSound2DServer::get_singleton()) ); Globals::get_singleton()->add_singleton( Globals::Singleton("SpatialSoundServer",SpatialSoundServer::get_singleton()) );
Globals::get_singleton()->add_singleton( Globals::Singleton("SS",SpatialSound2DServer::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("SpatialSound2DServer",SpatialSound2DServer::get_singleton()) );
Globals::get_singleton()->add_singleton( Globals::Singleton("SS2D",SpatialSound2DServer::get_singleton()) ); Globals::get_singleton()->add_singleton( Globals::Singleton("SS2D",SpatialSound2DServer::get_singleton()) );