From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 12 Dec 2014 01:10:19 +0000 (+0000)
Subject: Fix undeclared globals in functions and shorten lines in misc_helpers.lua.
X-Git-Tag: 0.4.11~60
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f114fc74d621a7cfb1e63b5405fddb0208ee71d2;p=oweals%2Fminetest.git

Fix undeclared globals in functions and shorten lines in misc_helpers.lua.
---

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index e1dc28965..dc358e65a 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -463,7 +463,8 @@ function core.explode_table_event(evt)
 			local t = parts[1]:trim()
 			local r = tonumber(parts[2]:trim())
 			local c = tonumber(parts[3]:trim())
-			if type(r) == "number" and type(c) == "number" and t ~= "INV" then
+			if type(r) == "number" and type(c) == "number"
+					and t ~= "INV" then
 				return {type=t, row=r, column=c}
 			end
 		end
@@ -532,16 +533,18 @@ if INIT == "mainmenu" then
 		local arg = {n=select('#', ...), ...}
 		if arg.n >= 1 then
 			-- Insert positional parameters ($1, $2, ...)
-			result = ''
-			pos = 1
+			local result = ''
+			local pos = 1
 			while pos <= text:len() do
-				newpos = text:find('[$]', pos)
+				local newpos = text:find('[$]', pos)
 				if newpos == nil then
 					result = result .. text:sub(pos)
 					pos = text:len() + 1
 				else
-					paramindex = tonumber(text:sub(newpos+1, newpos+1))
-					result = result .. text:sub(pos, newpos-1) .. tostring(arg[paramindex])
+					local paramindex =
+						tonumber(text:sub(newpos+1, newpos+1))
+					result = result .. text:sub(pos, newpos-1)
+						.. tostring(arg[paramindex])
 					pos = newpos + 2
 				end
 			end