Skip to content

Menu fixes, rewrite garage opening code, minor tweaks #100

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 5 commits into from
May 6, 2025
Merged

Menu fixes, rewrite garage opening code, minor tweaks #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f0a3c2
Efficient garage opening code
NexiusTailer May 4, 2025
e8059bf
Fix menus and better menu title rendering
NexiusTailer May 4, 2025
92993d9
Update interiors in all cases
NexiusTailer May 4, 2025
a7a6417
Merge branch 'multitheftauto:develop' into develop
NexiusTailer May 6, 2025
f08abb7
Complete attached object validations
NexiusTailer May 6, 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
93 changes: 62 additions & 31 deletions amx/client/client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,54 +1366,61 @@ end
-- Menus

local function updateMenuSize(menu)
if not menu then return end

menu.width = (#menu.items[1] > 0 and (menu.leftColumnWidth + menu.rightColumnWidth) or (menu.leftColumnWidth)) + 2 * MENU_SIDE_PADDING
menu.height = MENU_ITEM_HEIGHT * math.max(#menu.items[0], #menu.items[1]) + MENU_TOP_PADDING + MENU_BOTTOM_PADDING
end

function AddMenuItem(id, column, caption)
local menu = g_Menus[id]
function AddMenuItem(menuID, column, caption)
local menu = g_Menus[menuID]
if not menu then return end

table.insert(menu.items[column], caption)
updateMenuSize(menu)
end

function CreateMenu(id, menu)
function CreateMenu(menuID, menu)
if not menu then return end

menu.x = math.floor(menu.x * screenWidth / 640)
menu.y = math.floor(menu.y * screenHeight / 480)
menu.leftColumnWidth = math.floor(menu.leftColumnWidth * screenWidth / 640)
menu.rightColumnWidth = math.floor(menu.rightColumnWidth * screenWidth / 480)
local id = 1
while g_TextDraws['m' .. id] do
id = id + 1
end
menu.titletextdraw = { text = menu.title, id = 'm' .. id, x = menu.x + MENU_SIDE_PADDING, y = menu.y - 0.5 * MENU_ITEM_HEIGHT, align = 1, font = 2 }
initTextDraw(menu.titletextdraw)
hideTextDraw(menu.titletextdraw)
menu.rightColumnWidth = math.floor(menu.rightColumnWidth * screenWidth / 640)

g_Menus[menuID] = menu
updateMenuSize(menu)
g_Menus[id] = menu
end

function DisableMenuRow(menuID, rowID)
local menu = g_Menus[menuID]
if not menu then return end

menu.disabledrows = menu.disabledrows or {}
table.insert(menu.disabledrows, rowID)
end

function SetMenuColumnHeader(menuID, column, text)
g_Menus[menuID].items[column][13] = text
local menu = g_Menus[menuID]
if not menu then return end

menu.items[column][13] = text
end

function ShowMenuForPlayer(menuID)
if not g_Menus[menuID] then return end

if g_CurrentMenu and g_CurrentMenu.anim then
g_CurrentMenu.anim:remove()
g_CurrentMenu.anim = nil
end

local prevMenu = g_CurrentMenu
g_CurrentMenu = g_Menus[menuID]
local closebtnSide = screenWidth * (30 / 1024)
local closebtnSide = screenWidth * (27 / 1024)

if not prevMenu then
g_CurrentMenu.alpha = 0
g_CurrentMenu.titletextdraw.alpha = 0

g_CurrentMenu.closebtn = guiCreateStaticImage(g_CurrentMenu.x + g_CurrentMenu.width - closebtnSide, g_CurrentMenu.y, closebtnSide, closebtnSide, 'client/closebtn.png', false, nil)
guiSetAlpha(g_CurrentMenu.closebtn, 0)
Expand Down Expand Up @@ -1450,25 +1457,25 @@ function ShowMenuForPlayer(menuID)
{ time = 500, from = 0, to = 1, fn = setMenuAlpha },
function()
setMenuAlpha(g_CurrentMenu, 1)
g_CurrentMenu.titletextdraw.alpha = nil
g_CurrentMenu.anim = nil
if g_CurrentMenu then
g_CurrentMenu.anim = nil
end
end
)

addEventHandler('onClientRender', root, renderMenu)
addEventHandler('onClientClick', root, menuClickHandler)
showCursor(true)
else
hideTextDraw(prevMenu.titletextdraw)
g_CurrentMenu.closebtn = prevMenu.closebtn
prevMenu.closebtn = nil
guiSetPosition(g_CurrentMenu.closebtn, g_CurrentMenu.x + g_CurrentMenu.width - closebtnSide, g_CurrentMenu.y, false)
g_CurrentMenu.closebtnhover = prevMenu.closebtnhover
prevMenu.closebtnhover = nil
guiSetPosition(g_CurrentMenu.closebtnhover, g_CurrentMenu.x + g_CurrentMenu.width - closebtnSide, g_CurrentMenu.y, false)
g_CurrentMenu.alpha = 1
setMenuAlpha(g_CurrentMenu, 1)
end
showTextDraw(g_CurrentMenu.titletextdraw)

bindKey('enter', 'down', OnKeyPress)
end

Expand All @@ -1478,29 +1485,39 @@ function HideMenuForPlayer(menuID)
g_CurrentMenu.anim:remove()
g_CurrentMenu.anim = nil
end
g_CurrentMenu.anim = Animation.createAndPlay(g_CurrentMenu, { time = 500, from = 1, to = 0, fn = setMenuAlpha }, exitMenu)
if menuID then
g_CurrentMenu.anim = Animation.createAndPlay(g_CurrentMenu, { time = 500, from = 1, to = 0, fn = setMenuAlpha }, closeMenu)
else
g_CurrentMenu.anim = Animation.createAndPlay(g_CurrentMenu, { time = 500, from = 1, to = 0, fn = setMenuAlpha }, exitMenu)
end
end
end

function DestroyMenu(menuID)
destroyTextDraw(g_Menus[menuID].titletextdraw)
if not g_Menus[menuID] then return end

if g_CurrentMenu and menuID == g_CurrentMenu.id then
exitMenu()
closeMenu()
end

g_Menus[menuID] = nil
end

function setMenuAlpha(menu, alpha)
if not menu then return end

menu.alpha = alpha
menu.titletextdraw.alpha = alpha
guiSetAlpha(menu.closebtn, .75 * alpha)
guiSetAlpha(menu.closebtnhover, .75 * alpha)

if menu.closebtn then
guiSetAlpha(menu.closebtn, .75 * alpha)
end
if menu.closebtnhover then
guiSetAlpha(menu.closebtnhover, .75 * alpha)
end
end

function closeMenu()
removeEventHandler('onClientRender', root, renderMenu)
hideTextDraw(g_CurrentMenu.titletextdraw)
g_CurrentMenu.titletextdraw.alpha = nil
removeEventHandler('onClientClick', root, menuClickHandler)
g_CurrentMenu.anim = nil
destroyElement(g_CurrentMenu.closebtn)
Expand All @@ -1526,7 +1543,19 @@ function renderMenu()
-- background
dxDrawRectangle(menu.x, menu.y, menu.width, menu.height, tocolor(0, 0, 0, 128 * menu.alpha))

if menu.title then
local titleX = menu.x + MENU_SIDE_PADDING
local titleY = menu.y + MENU_ITEM_HEIGHT - MENU_BOTTOM_PADDING
dxDrawText(menu.title, titleX, titleY, titleX, titleY, tocolor(255, 255, 255, 255 * menu.alpha), 0.9, 'bankgothic', 'left', 'center', false, false, false, true)
end

local cursorX, cursorY = getCursorPosition()

if not cursorX then
closeMenu()
return
end

cursorY = screenHeight * cursorY
-- selected row
local selectedRow
Expand All @@ -1539,8 +1568,7 @@ function renderMenu()
for column = 0, 1 do
for i, text in pairs(menu.items[column]) do
local x = menu.x + MENU_SIDE_PADDING + column * menu.leftColumnWidth
local y
local color, scale
local y, color, scale
if i < 13 then
-- regular item
y = menu.y + MENU_TOP_PADDING + (i - 1) * MENU_ITEM_HEIGHT
Expand All @@ -1565,18 +1593,21 @@ function menuClickHandler(button, state, clickX, clickY)
if state ~= 'up' then
return
end

if not g_CurrentMenu then
return
end

local cursorX, cursorY = getCursorPosition()
cursorY = screenHeight * cursorY
if cursorY < g_CurrentMenu.y + MENU_TOP_PADDING or cursorY > g_CurrentMenu.y + MENU_TOP_PADDING + math.max(#g_CurrentMenu.items[0], #g_CurrentMenu.items[1]) * MENU_ITEM_HEIGHT then
return
end

local selectedRow = math.floor((clickY - g_CurrentMenu.y - MENU_TOP_PADDING) / MENU_ITEM_HEIGHT)
if not (g_CurrentMenu.disabledrows and table.find(g_CurrentMenu.disabledrows, selectedRow)) then
serverAMXEvent('OnPlayerSelectedMenuRow', g_PlayerID, selectedRow)
exitMenu()
closeMenu()
end
end

Expand Down
40 changes: 29 additions & 11 deletions amx/client/garages.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,35 @@
addEventHandler('onClientRender', root,
addEventHandler('onClientResourceStart', resourceRoot,
function()
for i = 0, 49 do
local gx, gy, gz = getGaragePosition(i)
local px, py, pz = getElementPosition(localPlayer)
local dist = getDistanceBetweenPoints3D(gx, gy, gz, px, py, pz)
if (dist < 20) then
if (isGarageOpen(i) == false) then
server.setGarageOpen(i, true)
end
else
if (isGarageOpen(i) == true) then
server.setGarageOpen(i, false)
end
local colshape = createColSphere(gx, gy, gz, 20)
setElementData(colshape, 'GarageID', i)

-- Check initial proximity
if isElementWithinColShape(localPlayer, colshape) then
server.setGarageOpen(i, true)
end
end
end
)

addEventHandler('onClientColShapeHit', resourceRoot,
function(hitElement, matchingDimension)
if hitElement == localPlayer and matchingDimension then
local garage = getElementData(source, 'GarageID')
if garage and not isGarageOpen(garage) then
server.setGarageOpen(garage, true)
end
end
end
)

addEventHandler('onClientColShapeLeave', resourceRoot,
function(hitElement, matchingDimension)
if hitElement == localPlayer and matchingDimension then
local garage = getElementData(source, 'GarageID')
if garage and isGarageOpen(garage) then
server.setGarageOpen(garage, false)
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions amx/server/natives/a_players.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ function SetPlayerInterior(amx, player, interior)
return false
end
local oldInt = getElementInterior(player)
setElementInterior(player, interior)
if interior ~= oldInt then
setElementInterior(player, interior)
procCallOnAll('OnPlayerInteriorChange', playerId, interior, oldInt)
clientCall(player, 'AMX_OnPlayerInteriorChange', interior, oldInt)
end
Expand Down Expand Up @@ -415,7 +415,7 @@ function SetPlayerAttachedObject(amx, player, index, modelid, bone, fOffsetX, fO
local mtaBone = g_BoneMapping[bone]
local obj = createObject(modelid, x, y, z)

if obj ~= false then
if obj then
local playerID = getElemID(player)
g_Players[playerID].attachedObjects[index] = obj
setElementCollisionsEnabled(obj, false)
Expand All @@ -432,7 +432,7 @@ end
function RemovePlayerAttachedObject(amx, player, index)
local playerID = getElemID(player)
local obj = g_Players[playerID].attachedObjects[index] -- Get the object stored at this slot
if obj ~= nil and obj ~= false then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh good catch, lol 😅

if obj then
detachElementFromBone(obj)
destroyElement(obj)
g_Players[playerID].attachedObjects[index] = nil
Expand All @@ -444,7 +444,7 @@ end
function IsPlayerAttachedObjectSlotUsed(amx, player, index)
local playerID = getElemID(player)
local obj = g_Players[playerID].attachedObjects[index] -- Get the object stored at this slot
if obj ~= nil and obj ~= false then
if obj then
return true
end
return false
Expand Down