Fixed naming collision.

master
Robert Zenz 2015-12-19 12:17:31 +01:00
parent c6bd3e9298
commit 65670f557f
2 changed files with 24 additions and 5 deletions

View File

@ -54,6 +54,10 @@
<td class="name" nowrap><a href="#activate">activate ()</a></td>
<td class="summary">Activates the system, if it has not been disabled by setting
"autopickup_activate" to false in the configuration.</td>
</tr>
<tr>
<td class="name" nowrap><a href="#activate_internal">activate_internal ()</a></td>
<td class="summary">Activates the system, without checking the configuration.</td>
</tr>
<tr>
<td class="name" nowrap><a href="#has_just_been_dropped_by">has_just_been_dropped_by (entity, player)</a></td>
@ -80,7 +84,7 @@
<h2><a href="#Fields">Fields</a></h2>
<table class="function_list">
<tr>
<td class="name" nowrap><a href="#activate">activate</a></td>
<td class="name" nowrap><a href="#activate_automatically">activate_automatically</a></td>
<td class="summary">If the system should be automatically activated.</td>
</tr>
<tr>
@ -154,6 +158,21 @@
</dd>
<dt>
<a name = "activate_internal"></a>
<strong>activate_internal ()</strong>
</dt>
<dd>
Activates the system, without checking the configuration. Multiple calls
to this function have no effect.
</dd>
<dt>
<a name = "has_just_been_dropped_by"></a>
@ -268,8 +287,8 @@
<h2><a name="Fields"></a>Fields</h2>
<dl class="function">
<dt>
<a name = "activate"></a>
<strong>activate</strong>
<a name = "activate_automatically"></a>
<strong>activate_automatically</strong>
</dt>
<dd>
If the system should be automatically activated.

View File

@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- A system which allows to automatically pickup items which are on the ground.
autopickup = {
--- If the system should be automatically activated.
activate = settings.get_bool("autopickup_activate", true),
activate_automatically = settings.get_bool("autopickup_activate", true),
--- If the system is active/has been activated.
active = false,
@ -73,7 +73,7 @@ autopickup = {
--- Activates the system, if it has not been disabled by setting
-- "autopickup_activate" to false in the configuration.
function autopickup.activate()
if autopickup.activate then
if autopickup.activate_automatically then
autopickup.activate_internal()
end
end