Merge branch 'multitheftauto:master' into Weapons

Author: SpeedyFolf

[admin]/admin/admin_definitions.lua

@@ -10,7 +10,7 @@
 
 _DEBUG = false
 
-_version = '1.6'
+_version = '1.7'
 
 -- MISC DEFINITIONS
 ADMIN_CHAT_MAXLENGTH = 225

[admin]/admin/client/admin_client.lua

@@ -10,7 +10,7 @@
 
 _DEBUG = false
 
-_version = '1.6'
+_version = '1.7'
 _flags = {}
 _widgets = {}
 _settings = nil

[admin]/admin/client/admin_gui.lua

@@ -56,15 +56,15 @@ 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
 	local absoluteHeight = parentHeight * h
 
 	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)

[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 ( "", "" )
 

[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" )

[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?'

[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
 

[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 )