Skip to content

Fix variable typo in button check and volume range validation in dialogs #743

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

Open
iManGaaX wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix variable typo in button check and volume range validation in dialogs #743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions [gameplay]/dialogs/sourceC.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function messageBeep(soundType, soundVolume)
error("Bad argument @ 'messageBeep' [Invalid type at argument 1, got '" .. tostring(soundType) .. "']")
end

if not soundVolume or soundVolume > 1 or type(soundVolume) ~= "number" then
if not soundVolume or soundVolume < 0 or soundVolume > 1 or type(soundVolume) ~= "number" then
soundVolume = 1
end

Expand Down Expand Up @@ -103,7 +103,7 @@ function messageBox(messageTitle, messageContent, messageCallback, messageIcon,
if type(messageButtonDefault) ~= "number" then
error("Bad argument @ 'messageBox' [Expected number at argument 6, got " .. type(messageButtonDefault) .. "]")
elseif #messageButtons[messageButton] < messageButtonDefault then
error("Bad argument @ 'messageBox' [Invalid default at argument 6, " .. messageButton .. " only have " .. tostring(#messageButtons[messageButon]) .. " buttons.]")
error("Bad argument @ 'messageBox' [Invalid default at argument 6, " .. messageButton .. " only have " .. tostring(#messageButtons[messageButton]) .. " buttons.]")
end
else
messageButtonDefault = 1
Expand All @@ -122,7 +122,7 @@ function messageBox(messageTitle, messageContent, messageCallback, messageIcon,
if messageSoundVolume then
if type(messageSoundVolume) ~= "number" then
error("Bad argument @ 'messageBox' [Expected number at argument 8, got " .. type(messageSoundVolume) .. "]")
elseif messageSoundVolume > 1 or messageSoundVolume < 1 then
elseif messageSoundVolume > 1 or messageSoundVolume < 0 then
error("Bad argument @ 'messageBox' [Invalid volume at argument 8, got '" .. tostring(messageSoundVolume) .. "']")
end
else
Expand Down Expand Up @@ -222,7 +222,7 @@ function messageBoxEx(messageTitle, messageContent, messageIcon, messageButton,
if type(messageButtonDefault) ~= "number" then
error("Bad argument @ 'messageBoxEx' [Expected number at argument 5, got " .. type(messageButtonDefault) .. "]")
elseif #messageButtons[messageButton] < messageButtonDefault then
error("Bad argument @ 'messageBoxEx' [Invalid default at argument 5, " .. messageButton .. " only have " .. tostring(#messageButtons[messageButon]) .. " buttons.]")
error("Bad argument @ 'messageBoxEx' [Invalid default at argument 5, " .. messageButton .. " only have " .. tostring(#messageButtons[messageButton]) .. " buttons.]")
end
else
messageButtonDefault = 1
Expand Down Expand Up @@ -307,4 +307,4 @@ function messageBoxEx(messageTitle, messageContent, messageIcon, messageButton,
messageBoxWindows[messageWindowElement] = {messageTitle, messageContent, messageIcon, messageButton}

return messageButtonElements[1], messageButtonElements[2], messageButtonElements[3]
end
end