Skip to content

admin: some tweaks #347

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 17 commits into from
Sep 25, 2021
Merged

admin: some tweaks #347

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4a026c4
fix call to wrong function
brenodanyel Aug 24, 2021
6aecfd7
replace deprecated "doesPedHaveJetPack"
brenodanyel Aug 24, 2021
de2770a
replace deprecated "removePedJetPack"
brenodanyel Aug 24, 2021
ff3c38e
replace deprecated "givePedJetPack"
brenodanyel Aug 24, 2021
0e47453
remove unused function (it was calling non-existent function)
brenodanyel Aug 24, 2021
bf0e4c8
remove invalid variable assignment
brenodanyel Aug 24, 2021
72bd65a
disable reference to commented button
brenodanyel Aug 24, 2021
063a842
fix use of undeclared variables
brenodanyel Aug 24, 2021
7bcc03f
remove everything related to the deprecated "community username"
brenodanyel Aug 24, 2021
ebf7a40
remove unused variable
brenodanyel Aug 24, 2021
a4604b7
replace deprecated "get/setPedRotation"
brenodanyel Aug 24, 2021
32945be
replace deprecated "get/setVehicleRotation"
brenodanyel Aug 24, 2021
6fedc73
fix invalid character in patterns
brenodanyel Aug 24, 2021
2ce4531
remove unused code
brenodanyel Aug 24, 2021
27092d4
remove reference to non-existent checkboxes
brenodanyel Aug 24, 2021
eabaf75
fix min_mta_version
brenodanyel Aug 24, 2021
a0621cc
fix annoying spectate console warning
brenodanyel Aug 25, 2021
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
8 changes: 0 additions & 8 deletions [admin]/admin/client/admin_client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,6 @@ function realTimeToSeconds( time )
return seconds
end

function realTimeToSecondsTest()
for i=1,100 do
local time1 = getRealTime( math.random(0, 60*60*24*365*50) ) -- Get a random date between 1970 and 2020
local time2 = getRealTime( realTimeToSeconds( time1 ) )
assert( getRealDateTimeString( time1 ) == getRealDateTimeString( time2 ) )
end
end

-- seconds to description i.e. "10 mins"
function secondsToTimeDesc( seconds )
if seconds then
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin/client/gui/admin_main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ function aAdminRefresh ()
guiSetText ( aTab1.Money, "Money: "..( aPlayers[player]["money"] or 0 ) )
if ( getElementDimension ( player ) ) then guiSetText ( aTab1.Dimension, "Dimension: "..getElementDimension ( player ) ) end
if ( getElementInterior ( player ) ) then guiSetText ( aTab1.Interior, "Interior: "..getElementInterior ( player ) ) end
guiSetText ( aTab1.JetPack, iif ( doesPedHaveJetPack ( player ), "Remove JetPack", "Give JetPack" ) )
guiSetText ( aTab1.JetPack, iif ( isPedWearingJetpack ( player ), "Remove JetPack", "Give JetPack" ) )
if ( getPedWeapon ( player ) ) then guiSetText ( aTab1.Weapon, "Weapon: "..getWeaponNameFromID ( getPedWeapon ( player ) ).." (ID: "..getPedWeapon ( player )..")" ) end

local x, y, z = getElementPosition ( player )
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin/client/gui/admin_messagebox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
**************************************]]

aMessageForm = nil
local varOne, varTwo, varThree = vOne, vTwo, vThree
local varOne, varTwo, varThree

function aMessageBox ( type, message, action, vOne, vTwo, vThree )
local x, y = guiGetScreenSize()
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin/client/gui/admin_permissions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function aPermissions.ConfirmChange(add)

if (not isElement(player)) then
aPermissions.Close(false)
messageBox("Player not found!", MB_WARNING)
aMessageBox ( "error", "Player not found!")
return
end

Expand Down
6 changes: 3 additions & 3 deletions [admin]/admin/client/gui/admin_vehicle.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ function aClientVehicleClick ( button )
triggerServerEvent ( "aVehicle", getLocalPlayer(), aVehicleCustomizePlayer, "setlights", { guiGetText ( aLightsColor ) } )
elseif ( source == aLicensePlateSet ) then
triggerServerEvent ( "aVehicle", getLocalPlayer(), aVehicleCustomizePlayer, "setplates", { guiGetText ( aLicensePlate ) } )
elseif ( source == aVehicleColorScheme ) then
guiSetVisible ( aVehicleColorForm, true )
guiBringToFront ( aVehicleColorForm )
-- elseif ( source == aVehicleColorScheme ) then
-- guiSetVisible ( aVehicleColorForm, true )
-- guiBringToFront ( aVehicleColorForm )
elseif ( source == aVehicleUpgradeAll ) then
triggerServerEvent ( "aVehicle", getLocalPlayer(), aVehicleCustomizePlayer, "customize", { "all" } )
setTimer ( aVehicleCheckCurrentUpgrades, 2000, 1, aVehicleCustomizeVehicle )
Expand Down
6 changes: 3 additions & 3 deletions [admin]/admin/server/admin_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,13 +1088,13 @@ addEventHandler ( "aPlayer", _root, function ( player, action, data, additional,
action = nil
end
elseif ( action == "jetpack" ) then
if ( doesPedHaveJetPack ( player ) ) then
removePedJetPack ( player )
if ( isPedWearingJetpack ( player ) ) then
setPedWearingJetpack ( player, false )
action = "jetpackr"
else
if ( getPedOccupiedVehicle ( player ) ) then outputChatBox ( "Unable to give a jetpack - "..getPlayerName ( player ).." is in a vehicle", source, 255, 0, 0 )
else
if ( givePedJetPack ( player ) ) then
if ( setPedWearingJetpack ( player, true ) ) then
action = "jetpacka"
end
end
Expand Down