V0.9.7 - Hotfix for Speaking

Quailsnap · Aug 22, 2017 · 05df76e · 05df76e
1 parent 072cf4c
commit 05df76e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/wh_nametags.Stratis/mission.sqm b/wh_nametags.Stratis/mission.sqm
@@ -12,10 +12,10 @@ class EditorData
 	};
 	class Camera
 	{
-		pos[]={1631.9945,5.9235735,5692.8818};
-		dir[]={0.85452998,-0.45815653,-0.24475303};
-		up[]={0.44047847,0.88885689,-0.12616111};
-		aside[]={-0.27535161,2.2235326e-008,-0.96136028};
+		pos[]={1632.7549,8.6774864,5693.4834};
+		dir[]={0.66272742,-0.69629455,-0.27569473};
+		up[]={0.64290893,0.71773326,-0.26744995};
+		aside[]={-0.38409871,1.6111881e-007,-0.92331386};
 	};
 };
 binarizationWanted=0;

diff --git a/...is/wh/nametags/functions/fn_isTalking.sqf → ...s/wh/nametags/functions/fn_isSpeaking.sqf b/...is/wh/nametags/functions/fn_isTalking.sqf → ...s/wh/nametags/functions/fn_isSpeaking.sqf
@@ -1,7 +1,7 @@
 //====================================================================================
 //
-//	fn_isTalking.sqf - Detect whether player is talking with ACRE/TFAR/Vanilla.
-//	> _isTalking = _unit call wh_nt_fnc_isTalking <
+//	fn_isSpeaking.sqf - Detect whether player is speaking with ACRE/TFAR/Vanilla.
+//	> _isSpeaking = _unit call wh_nt_fnc_isSpeaking <
 //
 //	Adapted from code by Killzone Kid, and from ACE3 code.
 //	- http://killzonekid.com/arma-scripting-tutorials-whos-talking/

diff --git a/wh_nametags.Stratis/wh/nametags/functions/fn_nametagDraw.sqf b/wh_nametags.Stratis/wh/nametags/functions/fn_nametagDraw.sqf
@@ -13,10 +13,12 @@
 //	Declare variables.
 //------------------------------------------------------------------------------------
 
-params ["_vehicle","_name","_nameColor","_locationData","_role","_groupName",
+params ["_unit","_vehicle","_name","_nameColor","_locationData","_role","_groupName",
 		"_drawRoleAndGroup","_isPassenger","_isCommander","_cameraPositionAGL",
 		"_zoom","_time","_startTime"];
 
+// _unit (CAManBase): Unit the tag is being rendered on.
+// _vehicle (Entity): Vehicle the unit is in. Possibly the unit.
 // _name (string): Friendly name of tag to be rendered.
 // _nameColor (color array [[],[],[],]): Original color of center nametag.
 // _locationData {code}: Code that will be used to find the location to draw the tag.
@@ -54,7 +56,8 @@ _distance = _player distance _targetPositionAGL;
 
 //	If the unit is speaking, apply little carets around their name.
 //	TODO: move up a few scopes. GetData? Will stick on cursor
-if (_x call wh_nt_fnc_isTalking) then
+//	TODO: changes from mission we played
+if (_unit call wh_nt_fnc_isSpeaking) then
 {
 	_timeEven = ((round time) % 2 == 0);
 	_nameColor set [3,0.90];

diff --git a/wh_nametags.Stratis/wh/nametags/functions/fn_nametagGetData.sqf b/wh_nametags.Stratis/wh/nametags/functions/fn_nametagGetData.sqf
@@ -258,6 +258,7 @@ private _zoom = 1;
 
 					//	Huck all this data into an array...
 					_unitData = [];
+					_unitData pushBack _x;
 					_unitData pushBack _entity;				// Index 0
 					_unitData pushBack _name;				// Index 1			
 					_unitData pushBack _nameColor;			// Index 2

diff --git a/wh_nametags.Stratis/wh/nametags/functions/fn_nametagUpdate.sqf b/wh_nametags.Stratis/wh/nametags/functions/fn_nametagUpdate.sqf
@@ -13,7 +13,7 @@
 //------------------------------------------------------------------------------------
 //	Initializing variables.
 //------------------------------------------------------------------------------------
-
+// TODO: all of this only if there's something to draw
 //	Store the player and the player's group.
 _player = WH_NT_PLAYER;
 _playerGroup = group _player;
@@ -65,7 +65,7 @@ if !( isNull _cursorObject ) then
 			_unitData =+ ((_toDraw select 1) select _index);
 
 			//	...adjust it so it knows it's the cursor target...
-			_unitData set [6,true];
+			_unitData set [7,true];
 
 			//	...take it out of the copy of the global cache...
 			(_toDraw select 0) deleteAt _index;

diff --git a/wh_nametags.Stratis/wh/nametags/readme.txt b/wh_nametags.Stratis/wh/nametags/readme.txt
@@ -1,6 +1,6 @@
 ==========================================================================================
 
-	WHALE'S NAMETAGS (V0.9.6 Beta) 
+	WHALE'S NAMETAGS (V0.9.7 Beta) 
 	SCRIPT FOR ARMA 3
 
 	( https://github.com/Whalen207/WH-NT )