浏览代码

Merge pull request #1931 from Faless/audio_free_rid

Expose AudioServer::free(RID rid) as AudioServer.free_rid(RID rid)
Rémi Verschelde 9 年之前
父节点
当前提交
2674565cf6
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      doc/engine_classes.xml
  2. 1 1
      servers/audio_server.cpp

+ 1 - 1
doc/engine_classes.xml

@@ -1502,7 +1502,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="free">
+		<method name="free_rid">
 			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>

+ 1 - 1
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 );