From 6cc471e986c694298716c257528c653395bd757d Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Fri, 15 Aug 2014 13:25:46 +0200
Subject: [PATCH] Simplify music player interface
---
technic/tools/flashlight.lua | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua
index 1be550e..0d22f11 100644
--- a/technic/tools/flashlight.lua
+++ b/technic/tools/flashlight.lua
@@ -13,6 +13,8 @@
description = S("Flashlight"),
inventory_image = "technic_flashlight.png",
stack_max = 1,
+ wear_represents = "technic_RE_charge",
+ on_refill = technic.refill_RE_charge,
})
minetest.register_craft({
@@ -37,10 +39,7 @@
for i = 1, 8 do
if hotbar[i]:get_name() == "technic:flashlight" then
local meta = minetest.deserialize(hotbar[i]:get_metadata())
- if not meta or not meta.charge then
- return false
- end
- if meta.charge >= 2 then
+ if meta and meta.charge and meta.charge >= 2 then
meta.charge = meta.charge - 2;
technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge)
hotbar[i]:set_metadata(minetest.serialize(meta))
@@ -80,7 +79,11 @@
local rounded_pos = vector.round(pos)
rounded_pos.y = rounded_pos.y + 1
local old_pos = player_positions[player_name]
- local player_moved = not vector.equals(old_pos, rounded_pos)
+ local player_moved = old_pos and not vector.equals(old_pos, rounded_pos)
+ if not old_pos then
+ old_pos = rounded_pos
+ player_moved = true
+ end
-- Remove light, flashlight weared out or was removed from hotbar
if was_wielding[player_name] and not flashlight_weared then
--
Gitblit v1.8.0