Skip to content

Commit 4473627

Browse files
t4imparamat
t4im
authored and
paramat
committedJul 15, 2016
Remove unused and clean up missused variable-value assignments.
* Unused variables * Unused values (assigned to variables, but overwritten before use) * Defining already defined variables instead of reassigning to them.
·
5.8.00.4.15
1 parent d7a7456 commit 4473627

File tree

12 files changed

+22
-31
lines changed

12 files changed

+22
-31
lines changed
 

Diff for: ‎mods/beds/functions.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ end
100100

101101
local function update_formspecs(finished)
102102
local ges = #minetest.get_connected_players()
103-
local form_n = ""
103+
local form_n
104104
local is_majority = (ges / 2) < player_in_bed
105105

106106
if finished then

Diff for: ‎mods/beds/spawns.lua

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ function beds.read_spawns()
3232
beds.save_spawns()
3333
os.rename(file, file .. ".backup")
3434
file = org_file
35-
else
36-
spawns = {}
3735
end
3836
end
3937

Diff for: ‎mods/boats/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function boat.on_step(self, dtime)
167167

168168
local p = self.object:getpos()
169169
p.y = p.y - 0.5
170-
local new_velo = {x = 0, y = 0, z = 0}
170+
local new_velo
171171
local new_acce = {x = 0, y = 0, z = 0}
172172
if not is_water(p) then
173173
local nodedef = minetest.registered_nodes[minetest.get_node(p).name]

Diff for: ‎mods/bones/init.lua

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ minetest.register_on_dieplayer(function(player)
174174
pos.z = math.floor(pos.z+0.5)
175175
local param2 = minetest.dir_to_facedir(player:get_look_dir())
176176
local player_name = player:get_player_name()
177-
local player_inv = player:get_inventory()
178177

179178
if (not may_replace(pos, player)) then
180179
if (may_replace({x=pos.x, y=pos.y+1, z=pos.z}, player)) then

Diff for: ‎mods/bucket/init.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
8080
else
8181
-- not buildable to; place the liquid above
8282
-- check if the node above can be replaced
83+
8384
lpos = pointed_thing.above
84-
local node = minetest.get_node_or_nil(lpos)
85+
node = minetest.get_node_or_nil(lpos)
8586
local above_ndef = node and minetest.registered_nodes[node.name]
8687

8788
if not above_ndef or not above_ndef.buildable_to then

Diff for: ‎mods/creative/init.lua

-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
197197
creative.update_creative_inventory(player_name)
198198
creative.set_creative_formspec(player, 0)
199199
else
200-
local formspec = player:get_inventory_formspec()
201200
local start_i = player_inventory[player_name].start_i or 0
202201

203202
if fields.creative_prev then

Diff for: ‎mods/default/craftitems.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ local lpp = 14 -- Lines per book's page
1515
local function book_on_use(itemstack, user)
1616
local player_name = user:get_player_name()
1717
local data = minetest.deserialize(itemstack:get_metadata())
18-
local formspec, title, text, owner = "", "", "", player_name
18+
local title, text, owner = "", "", player_name
1919
local page, page_max, lines, string = 1, 1, {}, ""
2020

2121
if data then
@@ -38,6 +38,7 @@ local function book_on_use(itemstack, user)
3838
end
3939
end
4040

41+
local formspec
4142
if owner == player_name then
4243
formspec = "size[8,8]" .. default.gui_bg ..
4344
default.gui_bg_img ..
@@ -152,7 +153,6 @@ minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv
152153
return
153154
end
154155

155-
local copy = ItemStack("default:book_written")
156156
local original
157157
local index
158158
for i = 1, player:get_inventory():get_size("craft") do

Diff for: ‎mods/default/furnace.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ local function furnace_node_timer(pos, elapsed)
111111
local inv = meta:get_inventory()
112112
local srclist = inv:get_list("src")
113113
local fuellist = inv:get_list("fuel")
114-
local dstlist = inv:get_list("dst")
115114

116115
--
117116
-- Cooking
@@ -172,7 +171,7 @@ local function furnace_node_timer(pos, elapsed)
172171
-- Update formspec, infotext and node
173172
--
174173
local formspec = inactive_formspec
175-
local item_state = ""
174+
local item_state
176175
local item_percent = 0
177176
if cookable then
178177
item_percent = math.floor(src_time / cooked.time * 100)

Diff for: ‎mods/default/trees.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ function default.grow_tree(pos, is_apple_tree, bad)
176176

177177
local vm = minetest.get_voxel_manip()
178178
local minp, maxp = vm:read_from_map(
179-
{x = pos.x - 2, y = pos.y, z = pos.z - 2},
180-
{x = pos.x + 2, y = pos.y + height + 1, z = pos.z + 2}
179+
{x = x - 2, y = y, z = z - 2},
180+
{x = x + 2, y = y + height + 1, z = z + 2}
181181
)
182182
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
183183
local data = vm:get_data()
@@ -211,8 +211,8 @@ function default.grow_jungle_tree(pos, bad)
211211

212212
local vm = minetest.get_voxel_manip()
213213
local minp, maxp = vm:read_from_map(
214-
{x = pos.x - 3, y = pos.y - 1, z = pos.z - 3},
215-
{x = pos.x + 3, y = pos.y + height + 1, z = pos.z + 3}
214+
{x = x - 3, y = y - 1, z = z - 3},
215+
{x = x + 3, y = y + height + 1, z = z + 3}
216216
)
217217
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
218218
local data = vm:get_data()
@@ -331,7 +331,7 @@ function default.grow_pine_tree(pos, snow)
331331
end
332332
end
333333

334-
local dev = 2
334+
dev = 2
335335
for yy = my + 1, my + 2 do
336336
for zz = z - dev, z + dev do
337337
local vi = a:index(x - dev, yy, zz)

Diff for: ‎mods/doors/init.lua

+2-5
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ function _doors.door_toggle(pos, node, clicker)
156156
end
157157
end
158158

159-
local old = state
160159
-- until Lua-5.2 we have no bitwise operators :(
161160
if state % 2 == 1 then
162161
state = state - 1
@@ -186,7 +185,6 @@ end
186185
local function on_place_node(place_to, newnode,
187186
placer, oldnode, itemstack, pointed_thing)
188187
-- Run script hook
189-
local _, callback
190188
for _, callback in ipairs(core.registered_on_placenodes) do
191189
-- Deepcopy pos, node and pointed_thing because callback can modify them
192190
local place_to_copy = {x = place_to.x, y = place_to.y, z = place_to.z}
@@ -250,7 +248,7 @@ function doors.register(name, def)
250248
inventory_image = def.inventory_image,
251249

252250
on_place = function(itemstack, placer, pointed_thing)
253-
local pos = nil
251+
local pos
254252

255253
if not pointed_thing.type == "node" then
256254
return itemstack
@@ -314,7 +312,6 @@ function doors.register(name, def)
314312
meta:set_int("state", state)
315313

316314
if def.protected then
317-
local pn = placer:get_player_name()
318315
meta:set_string("doors_owner", pn)
319316
meta:set_string("infotext", "Owned by " .. pn)
320317
end
@@ -347,7 +344,7 @@ function doors.register(name, def)
347344
return true
348345
end
349346
local meta = minetest.get_meta(pos)
350-
local name = ""
347+
local name
351348
if digger then
352349
name = digger:get_player_name()
353350
end

Diff for: ‎mods/farming/api.lua

-2
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,9 @@ farming.register_plant = function(name, def)
319319
nodegroups[pname] = i
320320

321321
local next_plant = nil
322-
local on_timer = nil
323322

324323
if i < def.steps then
325324
next_plant = mname .. ":" .. pname .. "_" .. (i + 1)
326-
on_timer = farming.grow_plant
327325
lbm_nodes[#lbm_nodes + 1] = mname .. ":" .. pname .. "_" .. i
328326
end
329327

Diff for: ‎mods/tnt/init.lua

+8-8
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ local function entity_physics(pos, radius, drops)
153153
local dir = vector.normalize(vector.subtract(obj_pos, pos))
154154
local moveoff = vector.multiply(dir, dist + 1.0)
155155
local newpos = vector.add(pos, moveoff)
156-
local newpos = vector.add(newpos, {x = 0, y = 0.2, z = 0})
156+
newpos = vector.add(newpos, {x = 0, y = 0.2, z = 0})
157157
obj:setpos(newpos)
158158

159159
obj:set_hp(obj:get_hp() - damage)
@@ -261,7 +261,7 @@ function tnt.burn(pos)
261261
end
262262

263263
local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast)
264-
local pos = vector.round(pos)
264+
pos = vector.round(pos)
265265
-- scan for adjacent TNT nodes first, and enlarge the explosion
266266
local vm1 = VoxelManip()
267267
local p1 = vector.subtract(pos, 2)
@@ -298,11 +298,11 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast)
298298
-- perform the explosion
299299
local vm = VoxelManip()
300300
local pr = PseudoRandom(os.time())
301-
local p1 = vector.subtract(pos, radius)
302-
local p2 = vector.add(pos, radius)
303-
local minp, maxp = vm:read_from_map(p1, p2)
304-
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
305-
local data = vm:get_data()
301+
p1 = vector.subtract(pos, radius)
302+
p2 = vector.add(pos, radius)
303+
minp, maxp = vm:read_from_map(p1, p2)
304+
a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
305+
data = vm:get_data()
306306

307307
local drops = {}
308308
local on_blast_queue = {}
@@ -515,7 +515,7 @@ if enable_tnt then
515515
end
516516

517517
function tnt.register_tnt(def)
518-
local name = ""
518+
local name
519519
if not def.name:find(':') then
520520
name = "tnt:" .. def.name
521521
else

0 commit comments

Comments
 (0)
Please sign in to comment.