From d7b572bc7d5d7b2bc98186065c0da61668ba1d73 Mon Sep 17 00:00:00 2001
From: nomisum <nomisum@googlemail.com>
Date: Tue, 15 Mar 2016 00:49:43 +0100
Subject: [PATCH] fix destroy radiotruck, fix civ hint, fix start marker

---
 Engima/Traffic/Server/randomCivilian.sqf |  3 ---
 player/teleportPlayer.sqf                |  4 ++--
 server/civKillListener.sqf               |  6 ++++--
 spawn/addInteractions.sqf                |  4 ++--
 stringtable.xml                          | 10 ++++++++++
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Engima/Traffic/Server/randomCivilian.sqf b/Engima/Traffic/Server/randomCivilian.sqf
index 09d48fc2..df8a2f50 100644
--- a/Engima/Traffic/Server/randomCivilian.sqf
+++ b/Engima/Traffic/Server/randomCivilian.sqf
@@ -6,9 +6,6 @@ randomCivilian = {
 	_unit = _this select 0;
 
 	_rds_rhs_civilian = [
-	"rds_schoolteacher",
-	"rds_doctor",
-	"rds_uniform_assistant",
 	"rds_uniform_Worker1",
 	"rds_uniform_Worker2",
 	"rds_uniform_Worker3",
diff --git a/player/teleportPlayer.sqf b/player/teleportPlayer.sqf
index 7678341f..5a77e9b8 100644
--- a/player/teleportPlayer.sqf
+++ b/player/teleportPlayer.sqf
@@ -40,9 +40,9 @@ addOpforSpawnpadMarker = {
 };
 
 if (side player == west) then {
-	US_SPAWNPAD call addBluforSpawnpadMarker;
+	[getPos US_SPAWN_PAD] call addBluforSpawnpadMarker;
 };
 
 if (side player == east) then {
-	RUS_SPAWNPAD call addOpforSpawnpadMarker;
+	[getPos RUS_SPAWN_PAD] call addOpforSpawnpadMarker;
 };
\ No newline at end of file
diff --git a/server/civKillListener.sqf b/server/civKillListener.sqf
index 5f61f6c2..ec3dbb69 100644
--- a/server/civKillListener.sqf
+++ b/server/civKillListener.sqf
@@ -1,6 +1,8 @@
 _CIV_KILLED_POS_listener = {
-    _pos = _this;
-		[{[_pos] execVM "player\civKilledMarker.sqf";},"BIS_fnc_spawn",true,true] call BIS_fnc_MP;
+    _pos = _this select 0;
+
+    [[[_pos],"player\civKilledMarker.sqf"],"BIS_fnc_execVM",true,true] call BIS_fnc_MP;
+		
    };
 
 
diff --git a/spawn/addInteractions.sqf b/spawn/addInteractions.sqf
index 12d45863..7bc4bfea 100644
--- a/spawn/addInteractions.sqf
+++ b/spawn/addInteractions.sqf
@@ -21,9 +21,9 @@ _rusAction = ["RusBuyMenu", (localize "str_GRAD_buy_vehicles"), "",
 ["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_rusAction] call ace_interact_menu_fnc_addActionToClass;
 
 
-_destroyAction = ["usDestroyMenu", (localize "str_GRAD_buy_vehicles"), "",
+_destroyAction = ["usDestroyMenu", (localize "str_GRAD_destroy_vehicle"), "",
  {
- [60, [], {(_this select 0) setdamage 1;}, {hint "Cancelled"}, "Destroying radio equipment"] call ace_common_fnc_progressBar;
+ [60, [_this select 0], {((_this select 0) select 0) setdamage 1;}, {hint "Cancelled action"}, (localize "str_GRAD_destroying_radio")] call ace_common_fnc_progressBar;
  },
   {side player == west}] call ace_interact_menu_fnc_createAction;  
 ["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_destroyAction] call ace_interact_menu_fnc_addActionToClass;
diff --git a/stringtable.xml b/stringtable.xml
index 40ca858e..2ad03858 100644
--- a/stringtable.xml
+++ b/stringtable.xml
@@ -140,6 +140,16 @@
 				<German>Fahrzeuge kaufen</German>
 				<French>Sélectionner des voitures</French>
 			</Key>
+			<Key ID="str_GRAD_destroy_vehicle">
+				<Original>Destroy Radio Truck</Original>
+				<English>Destroy Radio Truck</English>
+				<German>Funkwagen zerstören</German>
+			</Key>
+			<Key ID="str_GRAD_destroying_radio">
+				<Original>Destroying radio equipment...</Original>
+				<English>Destroying radio equipment...</English>
+				<German>Zerstöre Funkequipment...</German>
+			</Key>
 			<Key ID="str_GRAD_jip">
 				<Original>Sorry, you joined too late. Spectate and enjoy!</Original>
 				<English>Sorry, you joined too late. Spectate and enjoy!</English>