markers

gruppe-adler · Mar 15, 2016 · 7885823 · 7885823
1 parent d7b572b
commit 7885823
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/player/bluforBluforTeleportListener.sqf b/player/bluforBluforTeleportListener.sqf
@@ -1,5 +1,5 @@
 addBluforSpawnMarker = {
-	_pos = _this;
+	_pos = _this select 0;
 
 
 	_blufor_marker_start = createMarkerLocal ["blufor_marker_start", _pos];
@@ -10,7 +10,7 @@ addBluforSpawnMarker = {
 _BLUFOR_TELEPORT_TARGET_listener = {
 	_pos = _this select 1;
 
-	_pos call addBluforSpawnMarker;
+	[_pos] call addBluforSpawnMarker;
 
 	[_pos, 50] execVM "player\teleportPlayer.sqf";
 };

diff --git a/player/civKilledMarker.sqf b/player/civKilledMarker.sqf
@@ -6,12 +6,13 @@ showCivKilledHint = {
 };
 
 createCivKilledMarker = {
-	_marker1Nam = format["civKilledMarkerName_%1",(_this select 0)];
-	xxx = createMarkerLocal [_marker1Nam, (_this select 0)];
-	"civ_killed_marker" setMarkerShapeLocal "ICON";
-	"civ_killed_marker" setMarkerTypeLocal "KIA";
-	"civ_killed_marker" setMarkerColorLocal "ColorCivilian";
-	"civ_killed_marker" setMarkerAlphaLocal 1;
+	_marker = createMarkerLocal [format["%1",_pos],_pos];
+
+	_marker setMarkerShapeLocal "ICON";
+	_marker setMarkerTypeLocal "KIA";
+	_marker setMarkerColorLocal "ColorCivilian";
+
+	diag_log format ["CivKills: Marker %1 created", _marker];
 };
 
 [_pos] call createCivKilledMarker;

diff --git a/player/opforOpforTeleportListener.sqf b/player/opforOpforTeleportListener.sqf
@@ -1,7 +1,7 @@
 #include "..\missionMacros.h"
 
 createOpforMarker = {
-	_opfor_marker = createMarker ["opfor_marker", _this];
+	_opfor_marker = createMarker ["opfor_marker", _this select 0];
 	_opfor_marker setMarkerType "hd_objective";
 	_opfor_marker setMarkerColor "ColorWEST";
 	// with sector module, marker is only needed for getting position
@@ -14,7 +14,7 @@ _OPFOR_TELEPORT_TARGET_listener = {
 
 	[_pos, 50] execVM "player\teleportPlayer.sqf";
 
-	_pos call createOpforMarker;
+	[_pos] call createOpforMarker;
 
 	closeDialog 0;
 };

diff --git a/player/russianMarker.sqf b/player/russianMarker.sqf
@@ -3,7 +3,7 @@ xxx = createMarkerLocal ["opfor_marker", [0, 0, 0]];
 "opfor_marker" setMarkerShapeLocal "ELLIPSE";
 "opfor_marker" setMarkerTypeLocal "mil_unknown";
 "opfor_marker" setMarkerColorLocal "ColorOpfor";
-"opfor_marker" setMarkerAlphaLocal 1;
+"opfor_marker" setMarkerAlphaLocal 0;
 "opfor_marker" setMarkerSizeLocal [1, 1];
 "opfor_marker" setMarkerBrushLocal "SolidFull";
 

diff --git a/player/teleportPlayer.sqf b/player/teleportPlayer.sqf
@@ -27,16 +27,18 @@ addBluforSpawnpadMarker = {
 	_pos = _this;
 
 	_blufor_marker_start = createMarkerLocal ["blufor_marker_spawnpad", _pos];
+	_blufor_marker_start setMarkerShapeLocal "ICON";
 	_blufor_marker_start setMarkerTypeLocal "hd_pickup";
 	_blufor_marker_start setMarkerColorLocal "ColorWEST";
 };
 
 addOpforSpawnpadMarker = {
 	_pos = _this;
 
-	_blufor_marker_start = createMarkerLocal ["opfor_marker_spawnpad", _pos];
-	_blufor_marker_start setMarkerTypeLocal "hd_pickup";
-	_blufor_marker_start setMarkerColorLocal "ColorEAST";
+	_opfor_marker_start = createMarkerLocal ["opfor_marker_spawnpad", _pos];
+	_opfor_marker_start setMarkerShapeLocal "ICON";
+	_opfor_marker_start setMarkerTypeLocal "hd_pickup";
+	_opfor_marker_start setMarkerColorLocal "ColorEAST";
 };
 
 if (side player == west) then {