Skip to content

admin: Fix gridlist bug #683

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
Sep 15, 2025
Merged

admin: Fix gridlist bug #683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1e121
Update admin_main.lua
omar-o22 Sep 13, 2025
7161dde
Fix lint warning
omar-o22 Sep 13, 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
12 changes: 12 additions & 0 deletions [admin]/admin/client/gui/admin_main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal
if weaponID then
aCurrentWeapon = weaponID
guiSetText(aTab1.GiveWeapon, "Give: " .. (shortNames[selectedText] or selectedText))
else
local fallbackWeaponID = getWeaponIDFromName(selectedText)
if fallbackWeaponID then
aCurrentWeapon = fallbackWeaponID
guiSetText(aTab1.GiveWeapon, "Give: " .. (shortNames[selectedText] or selectedText))
end
end
end)

Expand Down Expand Up @@ -177,6 +183,12 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal
if modelID then
aCurrentVehicle = modelID
guiSetText ( aTab1.GiveVehicle, "Give: "..selectedText )
else
local fallbackModelID = getVehicleModelFromName(selectedText)
if fallbackModelID then
aCurrentVehicle = fallbackModelID
guiSetText ( aTab1.GiveVehicle, "Give: "..selectedText )
end
end
end)

Expand Down