Merge pull request #101 from GamingAtDeathsDoor/master

Removed old Hint and Replaced with Baguette.

@ExileServer/extDB/sql_custom (64-bit)/exile.ini

@@ -0,0 +1,38 @@
+;1. Find following sections and replace the commented lines;
+;This is the 64-Bit version of the exile.ini addons for ExAd just to make it easier for those who use 64-Bit servers.
+
+[loadVehicleIdPage]
+;SQL1_1 = SELECT id FROM vehicle LIMIT ?,?
+SQL1_1 = SELECT id FROM vehicle WHERE deleted_at IS NULL AND territory_id IS NULL LIMIT ?,?
+SQL1_INPUTS = 1,2
+OUTPUT = 1	
+
+; Removes vehicles that were not used within ? days
+[deleteOldVehicles]
+;SQL1_1 = DELETE FROM vehicle WHERE deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY)
+SQL1_1 = DELETE FROM vehicle WHERE territory_id IS NULL AND deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY)
+SQL1_INPUTS = 1
+
+; Marks for deletion vehicles that were not used within ? days
+[markDeleteOldVehicles]
+; SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY)
+SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY) AND territory_id IS NULL
+SQL1_INPUTS = 1
+
+;2. Add all below in the end of the file.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Virtual Garage related queries | ADDED BY [ExAd]Jan
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[loadTerritoryVehicles]
+SQL1_1 = SELECT id, class FROM vehicle WHERE territory_id = ?
+SQL1_INPUTS = 1
+OUTPUT = 1,2-STRING
+
+[loadVehFromVG]
+SQL1_1 = UPDATE vehicle SET territory_id = NULL WHERE id = ?
+SQL1_INPUTS = 1
+
+[loadVehToVG]
+SQL1_1 = UPDATE vehicle SET territory_id = ? WHERE id = ?
+SQL1_INPUTS = 1,2

mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf

@@ -40,7 +40,8 @@ if(ExAd_HALOPARACHUTE_SAFE_MODE)then{
 };
 
 if(ExAd_HALOPARACHUTE_USE_KEY_ACTIONS)then{
-	hint localize "STR_ExAd_HALOPARACHUTE_INFO_DETACH"
+	//hint localize "STR_ExAd_HALOPARACHUTE_INFO_DETACH"
+	[localize "STR_ExAd_HALOPARACHUTE_INFO_DETACH"] spawn ExileClient_gui_baguette_show;
 };
 
 true

mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf

@@ -67,6 +67,9 @@ ExAd_XM8_DV_fnc_spawnVehicle = {
 
     try
     {    
+        
+        if !(vehicle player == player) then { throw "You can't do this in a vehicle!"};
+        
         _bambiState = if(isNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState")) then
         {
             if(getNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState") > 0)then{true}else{false}

mpmissions/Exile.Altis/ExAdClient/XM8/Apps/Info/message.sqf

@@ -1,3 +1,12 @@
+/**
+    
+    Edit this file and what is on it will be formatted as structured text in game
+    on the Server Info App.
+    For information on Structured text in ArmA 3, go here:
+    https://community.bistudio.com/wiki/Structured_Text
+    
+ **/
+
 <t align='center' color='#E48A36'>GENERAL RULES</t><br />
 ______________________________________________________________________________<br />
 
@@ -9,3 +18,5 @@ ______________________________________________________________________________<b
 
 <t color='#E48A36'>BUILDING RULES</t><br />
 ______________________________________________________________________________<br />
+
+<t align='center' color='#FF0000'><a href="http://www.exilemod.com/topic/13865-exad-package-of-virtual-garagexm8statsbarhalo-parachuteadmin-eventshackinggrindingvehicle-upgrade/">ExAd by Janski</a></t><br />