From 5967ea4f2d5d78799df943f9843acf21dc4222dd Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 21 Dec 2023 17:06:33 +0200 Subject: [PATCH] lua: use local variables for `vec3.mid()` function --- Misc/qs_pak/scripts/edicts.lua | 19 ++++++++++--------- Misc/qs_pak/scripts/menus.lua | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Misc/qs_pak/scripts/edicts.lua b/Misc/qs_pak/scripts/edicts.lua index b37e43a1c..68a1fbf52 100644 --- a/Misc/qs_pak/scripts/edicts.lua +++ b/Misc/qs_pak/scripts/edicts.lua @@ -155,6 +155,7 @@ local localize = text.localize local vec3origin = vec3.new() local vec3one = vec3.new(1, 1, 1) local vec3minusone = vec3.new(-1, -1, -1) +local vec3mid = vec3.mid local FL_MONSTER = edicts.flags.FL_MONSTER local SOLID_NOT = edicts.solidstates.SOLID_NOT @@ -214,7 +215,7 @@ function edicts.issecret(edict) if not count then -- Regular or Arcane Dimensions secret that was not revealed yet local origin = edict.origin - location = origin == vec3origin and vec3.mid(min, max) or origin + location = origin == vec3origin and vec3mid(min, max) or origin elseif count == 0 then -- Revealed Arcane Dimensions secret, skip it return @@ -305,7 +306,7 @@ function edicts.isteleport(edict) end local description = format('Teleport to %s (%s)', target, targetlocation or 'target not found') - local location = vec3.mid(edict.absmin, edict.absmax) + local location = vec3mid(edict.absmin, edict.absmax) return description, location end @@ -348,7 +349,7 @@ function edicts.isdoor(edict) local itemprefix = itemname and itemname .. ' ' or '' local description = format('%s%sDoor', secretprefix, itemprefix) - local location = vec3.mid(edict.absmin, edict.absmax) + local location = vec3mid(edict.absmin, edict.absmax) return description, location end @@ -438,7 +439,7 @@ function edicts.isbutton(edict, current) end local description = (edict.health > 0 and 'Shoot' or 'Touch') .. ' button' - local location = vec3.mid(edict.absmin, edict.absmax) + local location = vec3mid(edict.absmin, edict.absmax) return description, location end @@ -455,7 +456,7 @@ function edicts.isexit(edict, current) local mapname = edict.map or '???' local description = 'Exit to ' .. (mapname == '' and '???' or mapname) - local location = vec3.mid(edict.absmin, edict.absmax) + local location = vec3mid(edict.absmin, edict.absmax) return description, location end @@ -477,7 +478,7 @@ function edicts.ismessage(edict) end local description = '"' .. message .. '"' - local location = vec3.mid(edict.absmin, edict.absmax) + local location = vec3mid(edict.absmin, edict.absmax) return description, location end @@ -569,7 +570,7 @@ function console.gazerefs(choice) end choice = choice and math.tointeger(choice) or 0 - local pos = vec3.mid(edict.absmin, edict.absmax) + local pos = vec3mid(edict.absmin, edict.absmax) if choice == 1 then player.setpos(pos) @@ -613,7 +614,7 @@ function console.gazerefs(choice) end edict = reflist[choice] - pos = vec3.mid(edict.absmin, edict.absmax) + pos = vec3mid(edict.absmin, edict.absmax) player.setpos(pos) else print('\2Gazed entity') @@ -629,7 +630,7 @@ function console.gazerefs(choice) print(header) for _, edict in ipairs(refs) do - pos = vec3.mid(edict.absmin, edict.absmax) + pos = vec3mid(edict.absmin, edict.absmax) print(index .. ':', getname(edict), 'at', pos) index = index + 1 diff --git a/Misc/qs_pak/scripts/menus.lua b/Misc/qs_pak/scripts/menus.lua index b9377eecd..67623eb2c 100644 --- a/Misc/qs_pak/scripts/menus.lua +++ b/Misc/qs_pak/scripts/menus.lua @@ -39,6 +39,7 @@ local floor = math.floor local format = string.format local insert = table.insert +local vec3mid = vec3.mid local pushpage = menu.pushpage local poppage = menu.poppage local clearpages = menu.clearpages @@ -356,7 +357,7 @@ local function describe(edict) local location, angles if not isfree(edict) then - location = vec3.mid(edict.absmin, edict.absmax) + location = vec3mid(edict.absmin, edict.absmax) angles = edict.angles if location == vec3origin then