summaryrefslogtreecommitdiff
path: root/servers
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2015-11-02 17:54:33 +0100
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2015-11-02 17:54:33 +0100
commit203f0693296094400db06f826b03cc1d63929223 (patch)
treefec9ae36d13c1dfe97a3a0fd5ef3db34e4786737 /servers
parentb2f9acb8c96aed0505cbac21661e21e4acef710f (diff)
Expose AudioServer::free(RID rid) as AudioServer::free_rid(RID rid)
to avoid script error due to collision with Object method free
Diffstat (limited to 'servers')
-rw-r--r--servers/audio_server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index c155f5204a..6c5a2de97b 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -132,7 +132,7 @@ void AudioServer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("voice_stop","voice"), &AudioServer::voice_stop );
- ObjectTypeDB::bind_method(_MD("free","rid"), &AudioServer::free );
+ ObjectTypeDB::bind_method(_MD("free_rid","rid"), &AudioServer::free );
ObjectTypeDB::bind_method(_MD("set_stream_global_volume_scale","scale"), &AudioServer::set_stream_global_volume_scale );
ObjectTypeDB::bind_method(_MD("get_stream_global_volume_scale"), &AudioServer::get_stream_global_volume_scale );