From c2926f8e820b866fbf4c65231ead26be51990c3e Mon Sep 17 00:00:00 2001 From: SpeedyFolf Date: Sun, 12 Jul 2026 21:28:09 -0500 Subject: [PATCH] Remove trailing whitespace Clean up trailing whitespace across all files in the repository. This is a formatting-only change with no functional modifications. --- [admin]/admin/client/admin_gui.lua | 8 +-- [admin]/admin/client/gui/admin_acl.lua | 2 +- [admin]/admin/client/gui/admin_main.lua | 10 +-- .../admin/client/gui/admin_permissions.lua | 10 +-- [admin]/admin/client/gui/admin_spectator.lua | 2 +- [admin]/admin/client/gui/admin_warp.lua | 2 +- [admin]/admin/meta.xml | 6 +- [admin]/admin/server/admin_server.lua | 2 +- [admin]/admin/server/admin_servermaps.lua | 4 +- [admin]/admin2/client/admin_gui.lua | 62 +++++++++---------- [admin]/admin2/client/admin_session.lua | 2 +- [admin]/admin2/client/main/admin_acl.lua | 12 ++-- [admin]/admin2/client/main/admin_bans.lua | 6 +- [admin]/admin2/client/widgets/admin_ban.lua | 4 +- .../client/widgets/admin_ban_details.lua | 2 +- [admin]/admin2/client/widgets/admin_color.lua | 22 +++---- .../admin2/client/widgets/admin_inputbox.lua | 6 +- .../admin2/client/widgets/admin_interior.lua | 6 +- .../client/widgets/admin_messagebox.lua | 2 +- .../admin2/client/widgets/admin_messages.lua | 4 +- .../client/widgets/admin_mute_details.lua | 2 +- .../client/widgets/admin_permissions.lua | 10 +-- .../client/widgets/admin_server_conf.lua | 4 +- [admin]/admin2/client/widgets/admin_skin.lua | 6 +- .../admin2/client/widgets/admin_spectator.lua | 2 +- .../admin2/client/widgets/admin_weapon.lua | 2 +- [admin]/admin2/conf/messages.xml | 40 ++++++------ [admin]/admin2/meta.xml | 16 ++--- [admin]/admin2/server/admin_ACL.lua | 14 ++--- [admin]/admin2/server/admin_bans.lua | 2 +- [admin]/admin2/server/admin_mute.lua | 8 +-- [admin]/admin2/server/admin_server.lua | 4 +- [admin]/admin2/server/admin_sync.lua | 30 ++++----- [admin]/admin2/shared/utils.lua | 8 +-- [admin]/ip2c/meta.xml | 4 +- [admin]/security/logging.lua | 16 ++--- [admin]/security/meta.xml | 4 +- [admin]/security/players.lua | 8 +-- [admin]/security/utils.lua | 4 +- [editor]/edf/edf_client.lua | 2 +- [editor]/editor_gui/client/currentbrowser.lua | 2 +- .../editor_gui/client/elementproperties.lua | 6 +- [editor]/editor_gui/client/options_action.lua | 22 +++---- .../editor_gui/client/options_backend.lua | 24 +++---- [editor]/editor_gui/client/options_gui.lua | 6 +- [editor]/editor_gui/client/test.lua | 10 +-- [editor]/editor_main/client/colpatch.lua | 34 +++++----- [editor]/editor_main/client/gridlines.lua | 18 +++--- [editor]/editor_main/client/main.lua | 18 +++--- [editor]/editor_main/meta.xml | 6 +- .../server/saveloadtest_server.lua | 6 +- [editor]/move_cursor/move_cursor.lua | 10 +-- [editor]/move_freecam/move_freecam.lua | 6 +- [editor]/move_keyboard/move_keyboard.lua | 14 ++--- .../[assault]/[maps]/as-area51/as-area51.map | 2 +- .../briefcaserace/server/br.server.game.lua | 2 +- [gamemodes]/[ctf]/ctf/ctf.lua | 2 +- .../deathmatch/client/spectate.lua | 6 +- .../[fallout]/fallout/player_init_s.lua | 2 +- [gamemodes]/[hay]/hay/hay_server.lua | 4 +- [gamemodes]/[play]/play/meta.xml | 2 +- [gamemodes]/[play]/play/play.lua | 2 +- [gamemodes]/[play]/play/play_players.lua | 2 +- [gamemodes]/[play]/play/play_vehicles.lua | 2 +- .../race-10laphotring/10Lap Hotring.map | 2 +- .../race-3lapdirtring/3Lap Dirtring.map | 2 +- .../[maps]/race-5lap8track/5Lap 8track.map | 2 +- .../race-airportdogfight/Airport Dogfight.map | 2 +- .../race-airportspeedway/Airport Speedway.map | 2 +- .../race-apacheassault/Apache Assault.map | 2 +- .../A Walk in the Park.map | 2 +- .../BADlands BLASTAround.map | 2 +- .../[race]/[maps]/race-bandito/Bandito.map | 2 +- .../race-bayareacircuit/Bay Area Circuit.map | 2 +- .../[maps]/race-bloodring/Bloodring.map | 2 +- .../[maps]/race-blowthedam/Blow the Dam.map | 2 +- .../Boating BLASTAround.map | 2 +- .../Bobcat BLASTAround.map | 2 +- .../[race]/[maps]/race-break/Break.map | 2 +- .../race-chiliadclimb/Chiliad Climb.map | 2 +- .../[maps]/race-chrmleasy/ChrML Easy.map | 2 +- .../[maps]/race-chrmlhard/ChrML Hard.map | 2 +- .../Degeneration Of X.map | 2 +- .../race-desertdogfight/Desert Dogfight.map | 2 +- .../Destruction Derby.map | 2 +- .../[maps]/race-dockbikes/Dock Bikes.map | 2 +- .../Dockside BLASTAround.map | 2 +- .../[race]/[maps]/race-drift/Drift.map | 2 +- .../[maps]/race-driftcity/KWK DRIFT CITY.map | 2 +- .../[maps]/race-dunebuggy/Dune Buggy.map | 2 +- .../[race]/[maps]/race-errand/Errand.map | 2 +- .../race-farewellmylove/Farewell My Love.map | 2 +- .../[maps]/race-farm2city/Farm2City.map | 2 +- .../[maps]/race-findthecock/Find the Cock.map | 2 +- .../[race]/[maps]/race-freeroam/Freeroam.map | 2 +- .../[race]/[maps]/race-highnoon/High Noon.map | 2 +- .../race-homeinthehills/Home in the Hills.map | 2 +- .../[race]/[maps]/race-hotroute/Hot Route.map | 2 +- .../[maps]/race-hydrarace/Hydra Race.map | 2 +- .../[race]/[maps]/race-island/Island.map | 2 +- .../Just Another Bike Race.map | 2 +- .../race-longwayround/Long Way Round.map | 2 +- .../[maps]/race-lsairport/LS Airport.map | 2 +- .../[maps]/race-lstrenches/LS Trenches.map | 2 +- .../[race]/[maps]/race-lvsprint/LV Sprint.map | 2 +- .../race-midairmayhem/MidAir Mayhem.map | 2 +- .../[race]/[maps]/race-miniputt/Miniputt.map | 2 +- .../Monster BLASTAround.map | 2 +- .../[race]/[maps]/race-mx_sky/mx_sky.map | 2 +- .../Offroad BLASTAround.map | 2 +- .../race-predatorzone/Predator Zone.map | 2 +- .../[maps]/race-quarryrun/Quarry Run.map | 2 +- .../[maps]/race-rcairwar/RC Air War.map | 2 +- .../[race]/[maps]/race-rcwarz/RC War Z.map | 2 +- .../[race]/[maps]/race-runway69/Runway 69.map | 2 +- .../race-rustlerrampage/Rustler Rampage.map | 2 +- .../[race]/[maps]/race-sandking/Sandking.map | 2 +- .../[maps]/race-santosdrive/Santos Drive.map | 2 +- .../[maps]/race-seadragon/Sea Dragon.map | 2 +- .../[maps]/race-seahunter/Sea Hunter.map | 2 +- .../[maps]/race-searustler/Sea Rustler.map | 2 +- .../[race]/[maps]/race-sewers/Sewers.map | 2 +- .../[maps]/race-sfbynight/SF by Night.map | 2 +- .../race-smugglersrun/Smugglers Run.map | 2 +- .../race-sparrowstorm/Sparrow Storm.map | 2 +- .../race-specialdelivery/Special Delivery.map | 2 +- .../race-speedforweed/KWK SPEED FOR WEED.map | 2 +- .../[maps]/race-squalorace/Squalo Race.map | 2 +- .../[race]/[maps]/race-stunt/Stunt.map | 2 +- .../Suburban Speedway.map | 2 +- .../race-superhydrarace/Super Hydra Race.map | 2 +- .../race-technicalitch/Technical Itch.map | 2 +- .../race-thepanopticon/The Panopticon.map | 2 +- .../Vinewood BLASTAround.map | 2 +- .../[race]/[maps]/race-wuzimu/Wu Zi Mu.map | 2 +- .../[maps]/sth-chinatown/chinatown.map | 2 +- .../[stealth]/[maps]/sth-factory/factory.map | 2 +- .../[maps]/sth-junkyard/junkyard.map | 2 +- .../[stealth]/[maps]/sth-sewers/sewers.map | 2 +- .../[maps]/sth-terminal/sth-terminal.map | 2 +- [gamemodes]/[stealth]/stealth/help.xml | 2 +- [gamemodes]/[stealth]/stealth/meta.xml | 2 +- [gameplay]/defaultstats/defaultstats.lua | 2 +- [gameplay]/dialogs/sourceC.lua | 6 +- [gameplay]/freeroam/fr_client.lua | 8 +-- .../remote_player_call_validation_server.lua | 2 +- [gameplay]/gps/meta.xml | 14 ++--- [gameplay]/gps/overlay.fx | 4 +- .../hedit/client/gui/languages/german.lua | 2 +- .../hedit/client/gui/languages/turkish.lua | 4 +- [gameplay]/hedit/client/utils.lua | 2 +- [gameplay]/joinquit/meta.xml | 2 +- [gameplay]/mapfixes/scripts/client/main.lua | 2 +- [gameplay]/parachute2/client.lua | 8 +-- [gameplay]/playerblips/server/main.lua | 2 +- [gameplay]/playercolors/meta.xml | 2 +- [gameplay]/scoreboard/dxscoreboard_rt.lua | 2 +- [gameplay]/superman/meta.xml | 4 +- [gameplay]/trainhorn/meta.xml | 2 +- [gameplay]/visualiser/texreptransform.fx | 32 +++++----- [managers]/chatmanager/meta.xml | 2 +- [managers]/mapcycler/list_mode.lua | 2 +- [managers]/mapcycler/meta.xml | 6 +- [web]/performancebrowser/luaTiming.lua | 8 +-- .../performancebrowser_client.lua | 2 +- 165 files changed, 422 insertions(+), 422 deletions(-) diff --git a/[admin]/admin/client/admin_gui.lua b/[admin]/admin/client/admin_gui.lua index 13d0b59ee..939c67d30 100644 --- a/[admin]/admin/client/admin_gui.lua +++ b/[admin]/admin/client/admin_gui.lua @@ -56,7 +56,7 @@ end function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right) local list = guiCreateButton(x, y, w, h, header, relative, parent, right) - + local parentWidth, parentHeight = guiGetSize(parent, false) local absoluteWidth = parentWidth * w @@ -64,7 +64,7 @@ function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right) local dropDown = guiCreateStaticImage(absoluteWidth - 20, 0, 20, 20, "client\\images\\dropdown.png", false, list) guiSetProperty(dropDown, 'AlwaysOnTop', 'True') - + addEventHandler('onClientGUIClick', dropDown, function() guiListSetVisible(list, true) end, false) @@ -75,7 +75,7 @@ function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right) local edit = guiCreateEdit(0, 0, absoluteWidth - 20, 20, '', false, bg) guiSetProperty(edit, 'AlwaysOnTop', 'True') - + addEventHandler('onClientGUIChanged', edit, function() guiListLoadItems(list) end) @@ -87,7 +87,7 @@ function guiCreateList(x, y, w, h, tabHeight, header, relative, parent, right) local close = guiCreateButton(absoluteWidth-20, 0, 20, 20, 'X', false, bg) guiSetProperty(close, 'AlwaysOnTop', 'True') guiSetAlpha(close, 1) - + addEventHandler('onClientGUIClick', close, function() guiListSetVisible(list, false) end, false) diff --git a/[admin]/admin/client/gui/admin_acl.lua b/[admin]/admin/client/gui/admin_acl.lua index e8a85f54b..198219757 100644 --- a/[admin]/admin/client/gui/admin_acl.lua +++ b/[admin]/admin/client/gui/admin_acl.lua @@ -49,7 +49,7 @@ function aManageACL () aACLSetRight = guiCreateButton ( 0.55, 0.40, 0.40, 0.04, "Enable Selected Right", true, aAclForm ) aACLRemoveRight = guiCreateButton ( 0.55, 0.45, 0.40, 0.04, "Disable Selected Right", true, aAclForm ) aACLDeleteRight = guiCreateButton ( 0.55, 0.55, 0.40, 0.04, "Delete Right", true, aAclForm ) - + aACLExit = guiCreateButton ( 0.75, 0.90, 0.27, 0.04, "Close", true, aAclForm ) aclDisplayOptions ( "", "" ) diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua index 4e4315d0f..dde203741 100644 --- a/[admin]/admin/client/gui/admin_main.lua +++ b/[admin]/admin/client/gui/admin_main.lua @@ -165,7 +165,7 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal aTab1.VehicleCustomize = guiCreateButton ( 0.85, 0.89, 0.13, 0.04, "Customize", true, aTab1.Tab, "customize" ) aTab1.AnonAdmin = guiCreateCheckBox (0.745, 0.942, 0.20, 0.04, "Anonymous Admin", isAnonAdmin(), true, aTab1.Tab ) aTab1.GiveVehicle = guiCreateList( 0.71, 0.710, 0.27, 0.04, 0.275, "Give: "..getVehicleNameFromModel ( aCurrentVehicle ), true, aTab1.Tab, 'givevehicle') - + local vehicles = {} for i = 400, 611 do local vehName = getVehicleNameFromModel(i) @@ -495,7 +495,7 @@ function aAdminRefresh () local player = getPlayerFromName ( guiGridListGetItemPlayerName ( aTab1.PlayerList, guiGridListGetSelectedItem( aTab1.PlayerList ), 1 ) ) if ( player and aPlayers[player] ) then local playerName = aPlayers[player]["name"] - + if isColorCodeHidden() then playerName = removeColorCoding(playerName) else @@ -525,11 +525,11 @@ function aAdminRefresh () if ( getElementInterior ( player ) ) then guiSetText ( aTab1.Interior, "Interior: "..getElementInterior ( player ) ) end 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 ) local zoneName = getZoneName ( x, y, z, false ) local cityName = getZoneName ( x, y, z, true ) - + guiSetText ( aTab1.Area, "Area: "..getSensitiveText( iif ( zoneName == cityName, zoneName, zoneName.." ("..cityName..")" ) ) ) x = getSensitiveText('%.3f'):format(x) @@ -1092,7 +1092,7 @@ function aClientClick ( button ) guiGridListClear ( aTab2.ResourceList ) triggerServerEvent ( "aSync", localPlayer, "resources" ) end - + -- TAB 3, WORLD elseif ( getElementParent ( source ) == aTab3.Tab ) then if ( source == aTab3.SetGameType ) then aInputBox ( "Game Type", "Enter game type:", "", "setGameType" ) diff --git a/[admin]/admin/client/gui/admin_permissions.lua b/[admin]/admin/client/gui/admin_permissions.lua index 52e8422da..5eff31abd 100644 --- a/[admin]/admin/client/gui/admin_permissions.lua +++ b/[admin]/admin/client/gui/admin_permissions.lua @@ -20,7 +20,7 @@ function aPermissions.Show(player) local x, y = guiGetScreenSize() aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, '', false) guiSetAlpha(aPermissions.Form, 1) - + aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, '', true, aPermissions.Form) aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form) guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85) @@ -35,11 +35,11 @@ function aPermissions.Show(player) aPermissions.Update = guiCreateButton(0.03, 0.88, 0.435, 0.09, "Refresh", true, aPermissions.Form) aPermissions.Hide = guiCreateButton(0.535, 0.88, 0.435, 0.09, "Close", true, aPermissions.Form) - + addEventHandler('aPermissionsSync', localPlayer, aPermissions.onSync) addEventHandler('aOnPermissionsChange', localPlayer, aPermissions.Refresh) addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick) - + --Register With Admin Form aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close) end @@ -105,13 +105,13 @@ function aPermissions.ConfirmChange(add) end local gridlist = add and aPermissions.AllGroups or aPermissions.PlayerGroups - + local selected = guiGridListGetSelectedItem(gridlist) if (selected <= -1) then return end - + local groupName = guiGridListGetItemText(gridlist, selected, 1) local str = add and 'Are you sure you want to add "%s" to the "%s" group?' or 'Are you sure you want to remove "%s" from the "%s" group?' diff --git a/[admin]/admin/client/gui/admin_spectator.lua b/[admin]/admin/client/gui/admin_spectator.lua index a9af74d8a..297bbe6cc 100644 --- a/[admin]/admin/client/gui/admin_spectator.lua +++ b/[admin]/admin/client/gui/admin_spectator.lua @@ -301,7 +301,7 @@ function aSpectator.CheckCollision(x, y, z) end end end - + return nearest_distance or false end diff --git a/[admin]/admin/client/gui/admin_warp.lua b/[admin]/admin/client/gui/admin_warp.lua index ce8033d05..a124cf113 100644 --- a/[admin]/admin/client/gui/admin_warp.lua +++ b/[admin]/admin/client/gui/admin_warp.lua @@ -160,7 +160,7 @@ function aClientWarpClick ( button, state, absX, absY ) aPlayerWarpClose ( false ) elseif ( source == aWarpToPosition ) then aPlayerWarpToPosition ( ) - + -- Player Warp To Position Map elseif ( source == aWarpToPositionMap ) then calculatePosition ( absX, absY ) diff --git a/[admin]/admin/meta.xml b/[admin]/admin/meta.xml index 69de3ce01..872cba402 100644 --- a/[admin]/admin/meta.xml +++ b/[admin]/admin/meta.xml @@ -154,14 +154,14 @@ group="_fake packets" accept="true,false" desc="Ban IPs that attempt to send fake admin packets." - /> - + /> + + /> px + sx2) or (y2 < py or y2 > py + sy2) then + function(button2, clickState, x2, y2) + local sx2, sy2 = guiGetSize(menu, false) + local px, py = guiGetPosition(menu, false) + if (x2 < px or x2 > px + sx2) or (y2 < py or y2 > py + sy2) then guiSetVisible(menu, false) removeEventHandler("onClientClick", root, debug.getinfo(1, "f").func) end @@ -243,18 +243,18 @@ function guiSetContextMenu(element, menu) end, false ) - addEventHandler( - "onClientGUIClick", - menu, - function(button, state) - if (state ~= "up") then - return - end - - guiSetVisible(menu, false) - end - ) -end + addEventHandler( + "onClientGUIClick", + menu, + function(button, state) + if (state ~= "up") then + return + end + + guiSetVisible(menu, false) + end + ) +end function guiContextMenuAddItem(element, text) local height = 16 diff --git a/[admin]/admin2/client/admin_session.lua b/[admin]/admin2/client/admin_session.lua index 31db0e2b3..f6050699c 100644 --- a/[admin]/admin2/client/admin_session.lua +++ b/[admin]/admin2/client/admin_session.lua @@ -23,7 +23,7 @@ addEventHandler( aSession = data aMap.UpdatePermissions() - + if (hasPermissionTo("general.adminpanel")) then outputChatBox("Press 'p' to open your admin panel", player) bindKey("p", "down", "adminpanel") diff --git a/[admin]/admin2/client/main/admin_acl.lua b/[admin]/admin2/client/main/admin_acl.lua index 6b3952d54..631e7073e 100644 --- a/[admin]/admin2/client/main/admin_acl.lua +++ b/[admin]/admin2/client/main/admin_acl.lua @@ -144,10 +144,10 @@ function aAclTab.onClick(key, state) local group = guiGridListGetItemText(aAclTab.Groups, selectedGroup, 1) local result = messageBox("Are you sure you want to remove the user '"..object.."' from the '"..group.."' ACL group?", MB_QUESTION, MB_YESNO) - + if (result) then triggerServerEvent(EVENT_ACL, localPlayer, ACL_USERS, ACL_REMOVE, group, 'user.'..object) - + aAclTab.Cache.Users[group] = nil aAclTab.RefreshUsersList() end @@ -163,7 +163,7 @@ function aAclTab.onClick(key, state) if (nick) then local group = guiGridListGetItemText(aAclTab.Groups, selected, 1) triggerServerEvent(EVENT_ACL, localPlayer, ACL_USERS, ACL_ADD, group, nick) - + aAclTab.Cache.Users[group] = nil aAclTab.RefreshUsersList() end @@ -179,7 +179,7 @@ function aAclTab.onClick(key, state) if (name) then local group = guiGridListGetItemText(aAclTab.Groups, selected, 1) triggerServerEvent(EVENT_ACL, localPlayer, ACL_RESOURCES, ACL_ADD, group, name) - + aAclTab.Cache.Resources[group] = nil aAclTab.RefreshResourcesList() end @@ -195,10 +195,10 @@ function aAclTab.onClick(key, state) local group = guiGridListGetItemText(aAclTab.Groups, selectedGroup, 1) local result = messageBox("Are you sure you want to remove the resource '"..object.."' from the '"..group.."' ACL group?", MB_QUESTION, MB_YESNO) - + if (result) then triggerServerEvent(EVENT_ACL, localPlayer, ACL_RESOURCES, ACL_REMOVE, group, 'resource.'..object) - + aAclTab.Cache.Resources[group] = nil aAclTab.RefreshResourcesList() end diff --git a/[admin]/admin2/client/main/admin_bans.lua b/[admin]/admin2/client/main/admin_bans.lua index fe0ee20bb..cde92aa68 100644 --- a/[admin]/admin2/client/main/admin_bans.lua +++ b/[admin]/admin2/client/main/admin_bans.lua @@ -36,9 +36,9 @@ function aBansTab.Create(tab) sync(SYNC_BANS) end -function aBansTab.onClientClick(button, state) - if (button == "left" and state == "up") then - if (source == aBansTab.Details) then +function aBansTab.onClientClick(button, state) + if (button == "left" and state == "up") then + if (source == aBansTab.Details) then if (guiGridListGetSelectedItem(aBansTab.BansList) == -1) then messageBox("No ban selected!", MB_ERROR, MB_OK) else diff --git a/[admin]/admin2/client/widgets/admin_ban.lua b/[admin]/admin2/client/widgets/admin_ban.lua index c121a5e44..ed81e22ea 100644 --- a/[admin]/admin2/client/widgets/admin_ban.lua +++ b/[admin]/admin2/client/widgets/admin_ban.lua @@ -24,7 +24,7 @@ function aBan.Show(player) if not aBan.Form then aBan.Create() end - + -- If a player was selected, auto-fill the form with the player's info if player then aBan.playerName = getPlayerName(player) @@ -224,7 +224,7 @@ function aBan.verifyForm() else banDuration = aBan.defaultDurations[durationSelection][2] end - + -- Verify ban IP local banIP = "" if guiCheckBoxGetSelected(aBan.IPCheckBox) then diff --git a/[admin]/admin2/client/widgets/admin_ban_details.lua b/[admin]/admin2/client/widgets/admin_ban_details.lua index 47d3e203c..7e9386235 100644 --- a/[admin]/admin2/client/widgets/admin_ban_details.lua +++ b/[admin]/admin2/client/widgets/admin_ban_details.lua @@ -14,7 +14,7 @@ function aBanDetails.Show(banID, showUnban) if not aBanDetails.Form then aBanDetails.Create() end - + aBanDetails.banID = banID local data = aBansTab.List[banID] guiSetText(aBanDetails.NickText, "Player name: "..(data.nick or "Unknown")) diff --git a/[admin]/admin2/client/widgets/admin_color.lua b/[admin]/admin2/client/widgets/admin_color.lua index 99720c8fc..9157f1b2a 100644 --- a/[admin]/admin2/client/widgets/admin_color.lua +++ b/[admin]/admin2/client/widgets/admin_color.lua @@ -82,7 +82,7 @@ function aColor.Open(x, y, r, g, b, relative, parent) aColor.Picking = false guiSetVisible(aColor.Form, true) - addEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose) + addEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose) addEventHandler("onClientRender", root, aColor.onRender) addEventHandler("onClientGUIChanged", aColor.Form, aColor.onChanged) addEventHandler("onClientGUIBlur", aColor.Form, aColor.onBlur) @@ -107,7 +107,7 @@ end function aColor.Close(destroy) guiSetInputEnabled(false) if (aColor.Form) then - removeEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose) + removeEventHandler("onClientGUIClick", aColor.Ok, aColor.onGuiClickClose) removeEventHandler("onClientGUIBlur", aColor.Form, aColor.onBlur) removeEventHandler("onClientGUIChanged", aColor.Form, aColor.onChanged) removeEventHandler("onClientClick", root, aColor.onClick) @@ -122,15 +122,15 @@ function aColor.Close(destroy) coroutine.resume(aColor.Thread) end end -end - -function aColor.onGuiClickClose(button, state) - if (button == "left" and state == "up") then - aColor.Close() - end -end - -function aColor.onClick(button, state, x, y) +end + +function aColor.onGuiClickClose(button, state) + if (button == "left" and state == "up") then + aColor.Close() + end +end + +function aColor.onClick(button, state, x, y) local px, py = guiGetPosition(aColor.Form, false) if (state == "up") then if (aColor.Picking) then diff --git a/[admin]/admin2/client/widgets/admin_inputbox.lua b/[admin]/admin2/client/widgets/admin_inputbox.lua index 7fc91b922..7f9667ed8 100644 --- a/[admin]/admin2/client/widgets/admin_inputbox.lua +++ b/[admin]/admin2/client/widgets/admin_inputbox.lua @@ -79,9 +79,9 @@ function aInputBox.onAccepted() aInputBox.Close(false) end -function aInputBox.onClick(button, state) - if (button == "left" and state == "up") then - if (source == aInputBox.Ok) then +function aInputBox.onClick(button, state) + if (button == "left" and state == "up") then + if (source == aInputBox.Ok) then aInputBox.Result = true aInputBox.Close(false) elseif (source == aInputBox.Cancel) then diff --git a/[admin]/admin2/client/widgets/admin_interior.lua b/[admin]/admin2/client/widgets/admin_interior.lua index eff46814c..c220a4b2f 100644 --- a/[admin]/admin2/client/widgets/admin_interior.lua +++ b/[admin]/admin2/client/widgets/admin_interior.lua @@ -75,9 +75,9 @@ function aInterior.onGUIChange() aInterior.Refresh() end -function aInterior.onClick(button, state) - if (button == "left" and state == "up") then - if (source == aInterior.Select) then +function aInterior.onClick(button, state) + if (button == "left" and state == "up") then + if (source == aInterior.Select) then if (guiGridListGetSelectedItem(aInterior.List) ~= -1) then triggerServerEvent( "aPlayer", diff --git a/[admin]/admin2/client/widgets/admin_messagebox.lua b/[admin]/admin2/client/widgets/admin_messagebox.lua index 826e9c3d0..c34875c27 100644 --- a/[admin]/admin2/client/widgets/admin_messagebox.lua +++ b/[admin]/admin2/client/widgets/admin_messagebox.lua @@ -66,7 +66,7 @@ function aMessageBox.Show(message, icon, type) guiSetText(aMessageBox.Label, tostring(message)) local mbX, mbY = guiGetSize(aMessageBox.Form, false) - + guiSetPosition(aMessageBox.Form, x / 2 - mbX / 2, y / 2 - mbY / 2, false) guiSetVisible(aMessageBox.Form, true) guiBringToFront(aMessageBox.Form) diff --git a/[admin]/admin2/client/widgets/admin_messages.lua b/[admin]/admin2/client/widgets/admin_messages.lua index 7b2f4f217..92893437e 100644 --- a/[admin]/admin2/client/widgets/admin_messages.lua +++ b/[admin]/admin2/client/widgets/admin_messages.lua @@ -97,13 +97,13 @@ end function aMessages.View(id) if (id) then local message = aMessages.Messages[id] - + guiSetText(aMessages.Author, "Author: "..message.author) guiSetText(aMessages.Subject, "Subject: "..message.subject) guiSetText(aMessages.Category, "Category: "..message.category) guiSetText(aMessages.Date, "Date: "..message.time) guiSetText(aMessages.Text, message.text) - + if (not message.read) then triggerServerEvent("aMessage", localPlayer, "read", id) end diff --git a/[admin]/admin2/client/widgets/admin_mute_details.lua b/[admin]/admin2/client/widgets/admin_mute_details.lua index 08a8d1911..4c5e2be50 100644 --- a/[admin]/admin2/client/widgets/admin_mute_details.lua +++ b/[admin]/admin2/client/widgets/admin_mute_details.lua @@ -16,7 +16,7 @@ function aMuteDetails.Show(Serial, showUnmtue) if not aMuteDetails.Form then aMuteDetails.Create() end - + aMuteDetails.Serial = Serial local data = aMuteTab.List[Serial] diff --git a/[admin]/admin2/client/widgets/admin_permissions.lua b/[admin]/admin2/client/widgets/admin_permissions.lua index 13d44154e..235198b0a 100644 --- a/[admin]/admin2/client/widgets/admin_permissions.lua +++ b/[admin]/admin2/client/widgets/admin_permissions.lua @@ -20,7 +20,7 @@ function aPermissions.Show(player) local x, y = guiGetScreenSize() aPermissions.Form = guiCreateWindow(x / 2 - 200, y / 2 - 125, 400, 250, '', false) guiSetAlpha(aPermissions.Form, 1) - + aPermissions.LabelYourPerms = guiCreateLabel(0.03, 0.1, 0.35, 0.07, '', true, aPermissions.Form) aPermissions.PlayerGroups = guiCreateGridList(0.03, 0.18, 0.35, 0.68, true, aPermissions.Form) guiGridListAddColumn(aPermissions.PlayerGroups, "Group Name", 0.85) @@ -35,10 +35,10 @@ function aPermissions.Show(player) aPermissions.Update = guiCreateButton(0.03, 0.88, 0.435, 0.09, "Refresh", true, aPermissions.Form) aPermissions.Hide = guiCreateButton(0.535, 0.88, 0.435, 0.09, "Close", true, aPermissions.Form) - + addEventHandler(EVENT_SYNC, localPlayer, aPermissions.onSync) addEventHandler("onClientGUIClick", aPermissions.Form, aPermissions.onClick) - + --Register With Admin Form aRegister("PlayerPermissions", aPermissions.Form, aPermissions.Show, aPermissions.Close) end @@ -110,13 +110,13 @@ function aPermissions.ConfirmChange(add) end local gridlist = add and aPermissions.AllGroups or aPermissions.PlayerGroups - + local selected = guiGridListGetSelectedItem(gridlist) if (selected <= -1) then return end - + local groupName = guiGridListGetItemText(gridlist, selected, 1) local str = add and 'Are you sure you want to add "%s" to the "%s" group?' or 'Are you sure you want to remove "%s" from the "%s" group?' diff --git a/[admin]/admin2/client/widgets/admin_server_conf.lua b/[admin]/admin2/client/widgets/admin_server_conf.lua index a9bf5a691..136c5ff35 100644 --- a/[admin]/admin2/client/widgets/admin_server_conf.lua +++ b/[admin]/admin2/client/widgets/admin_server_conf.lua @@ -25,7 +25,7 @@ function aServerConfig.Open() aServerConfig.Form = guiCreateWindow(x/2 - 240, y/2 - 215, 480, 430, "Server Configuration", false) guiCreateHeader(0.05, 0.052, 0.3, 0.04, "Connection:", true, aServerConfig.Form) - + aServerConfig.minVersion = guiCreateLabel(0.1, 0.089, 0.5, 0.04, "Minimum Client Version:", true, aServerConfig.Form) aServerConfig.minVersionField = guiCreateEdit(0.725, 0.089, 0.25, 0.04, "", true, aServerConfig.Form) @@ -82,7 +82,7 @@ function aServerConfig.Open() addEventHandler("onClientGUIClick", aServerConfig.Form, aServerConfig.onClientClick) addEventHandler('onClientGUIChanged', aServerConfig.Form, aServerConfig.onClientChanged) addEventHandler("onAdminRefresh", aServerConfig.Form, aServerConfig.Refresh) - + aServerConfig.Refresh() end diff --git a/[admin]/admin2/client/widgets/admin_skin.lua b/[admin]/admin2/client/widgets/admin_skin.lua index b2f61b576..253a69350 100644 --- a/[admin]/admin2/client/widgets/admin_skin.lua +++ b/[admin]/admin2/client/widgets/admin_skin.lua @@ -92,9 +92,9 @@ function aSkin.onGUIChange() end end -function aSkin.onClick(button, state) - if (button == "left" and state == "up") then - if (source == aSkin.Accept) then +function aSkin.onClick(button, state) + if (button == "left" and state == "up") then + if (source == aSkin.Accept) then if (tonumber(guiGetText(aSkin.ID))) then triggerServerEvent("aPlayer", localPlayer, aSkin.Select, "setskin", tonumber(guiGetText(aSkin.ID))) aSkin.Close(false) diff --git a/[admin]/admin2/client/widgets/admin_spectator.lua b/[admin]/admin2/client/widgets/admin_spectator.lua index 7981e7f1a..d87c35893 100644 --- a/[admin]/admin2/client/widgets/admin_spectator.lua +++ b/[admin]/admin2/client/widgets/admin_spectator.lua @@ -329,7 +329,7 @@ function aSpectator.CheckCollision(x, y, z) end end end - + return nearest_distance or false end diff --git a/[admin]/admin2/client/widgets/admin_weapon.lua b/[admin]/admin2/client/widgets/admin_weapon.lua index 904d5dc04..ab88f5622 100644 --- a/[admin]/admin2/client/widgets/admin_weapon.lua +++ b/[admin]/admin2/client/widgets/admin_weapon.lua @@ -24,7 +24,7 @@ function aWeapon.Show(player) guiCreateLabel(0.03, 0.09, 0.94, 0.07, "Select a weapon from the list or enter the id", true, aWeapon.Form) guiLabelSetHorizontalAlign(aWeapon.Label, "center") guiLabelSetColor(aWeapon.Label, 255, 0, 0) - + aWeapon.Edit = guiCreateEdit(0.03, 0.18, 0.70, 0.09, '', true, aWeapon.Form) guiCreateInnerImage("client\\images\\search.png", aWeapon.Edit) diff --git a/[admin]/admin2/conf/messages.xml b/[admin]/admin2/conf/messages.xml index 1762c1730..2b401d458 100644 --- a/[admin]/admin2/conf/messages.xml +++ b/[admin]/admin2/conf/messages.xml @@ -219,26 +219,26 @@ Waves height set to '$data' by $admin ADMIN: $admin has set waves height to '$data' - - FPS limit set to '$data' by $admin - ADMIN: $admin has set fps limit to '$data' - - - Ping kicker set to '$data' - ADMIN: $admin has set ping kicker to '$data' - - - FPS kicker set to '$data' - ADMIN: $admin has set fps kicker to '$data' - - - Idle kicker set to '$data' - ADMIN: $admin has set idle kicker to '$data' - - - Blur level set to '$data' by $admin - ADMIN: $admin has set blur level to '$data' - + + FPS limit set to '$data' by $admin + ADMIN: $admin has set fps limit to '$data' + + + Ping kicker set to '$data' + ADMIN: $admin has set ping kicker to '$data' + + + FPS kicker set to '$data' + ADMIN: $admin has set fps kicker to '$data' + + + Idle kicker set to '$data' + ADMIN: $admin has set idle kicker to '$data' + + + Blur level set to '$data' by $admin + ADMIN: $admin has set blur level to '$data' + Heat haze level set to '$data' by $admin ADMIN: $admin has set heat haze level to '$data' diff --git a/[admin]/admin2/meta.xml b/[admin]/admin2/meta.xml index e1769264b..294aa888c 100644 --- a/[admin]/admin2/meta.xml +++ b/[admin]/admin2/meta.xml @@ -5,16 +5,16 @@ WARNING: We give no support for edited versions of the admin system. --> - + true - +