Skip to content

Fix typo and Lint: Indentation, shadowing #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2025
Merged

Fix typo and Lint: Indentation, shadowing #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
964da9b
Lint: fixed indentation, shadowing upvalue scale in line 15 -> now cu…
PrimelPrime Mar 9, 2025
2b40cb4
fixed typo
PrimelPrime Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion [editor]/edf/edf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ function edfCloneElement(theElement, editorMode )
parametersTable = {}
parametersTable.position = {edfGetElementPosition(theElement)} or {0,0,0}
parametersTable.rotation = {edfGetElementRotation(theElement)} or {0,0,0}
parametersTable.scale = edfGetElementScale(theElement) or 2
parametersTable.scale = edfGetElementScale(theElement) or 1
parametersTable.interior = edfGetElementInterior(theElement) or 0
parametersTable.dimension = edfGetElementDimension(theElement) or 0
parametersTable.alpha = edfGetElementAlpha(theElement) or 255
Expand Down
2 changes: 1 addition & 1 deletion [editor]/editor_gui/client/currentbrowser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ function setTableElementIDs(elemTable)
local elementID = getElementID(v)
local numericID = ""
if getElementType(v) == "object" or getElementType(v) == "vehicle" or getElementType(v) == "ped" then
numericID = "[" .. (getElementData(v, "model") or getElementModel(v) or "Unknown") .. "]"
numericID = "[" .. (getElementData(v, "model") or getElementModel(v) or "Unknown") .. "]"
end
elementsWithIDs[k] = tostring(elementID) .. " " .. tostring(numericID)
end
Expand Down
2 changes: 1 addition & 1 deletion [editor]/editor_main/server/dumpxml.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ end
local specialSyncers = {
position = function() end,
rotation = function() end,
scale = function() end,
scale = function(element) return edf.edfGetElementScale(element) end,
dimension = function(element) return getElementData(element, "me:dimension") or 0 end,
interior = function(element) return edf.edfGetElementInterior(element) end,
alpha = function(element) return edf.edfGetElementAlpha(element) end,
Expand Down
8 changes: 4 additions & 4 deletions [editor]/move_keyboard/move_keyboard.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,13 @@ local function onClientRender_keyboard()

-- Scale up/down for objects
if getElementType(selectedElement) == "object" then
local scale = getObjectScale(selectedElement)
local currentScale = getObjectScale(selectedElement)
if getCommandState("element_scale_up") then
scale = scale + scaleIncrement
currentScale = currentScale + scaleIncrement
elseif getCommandState("element_scale_down") then
scale = scale - scaleIncrement
currentScale = currentScale - scaleIncrement
end
setObjectScale(selectedElement, scale)
setObjectScale(selectedElement, currentScale)
end
end
end
Expand Down