Improved prop handling

Author: DosMike

tf2gravihands.inc

@@ -3,8 +3,8 @@
 #endif
 #define _tf2_gravihands
 
-#define GRAVIHANDS_VERSION "22w08a"
-#define GRAVIHANDS_BUILD   220801
+#define GRAVIHANDS_VERSION "22w41a"
+#define GRAVIHANDS_BUILD   224101
 
 /**
  * There are two flags that might not be immediately obvious:

tf2gravihands.sp

@@ -34,7 +34,7 @@
 #pragma newdecls required
 #pragma semicolon 1
 
-#define PLUGIN_VERSION "22w13a"
+#define PLUGIN_VERSION "22w41a"
 //#define PLUGIN_DEBUG
 
 public Plugin myinfo = {
@@ -146,12 +146,6 @@ public void OnLibraryRemoved(const char[] name) {
 	if (StrEqual(name, "pvpoptin")) { depOptInPvP = false; }
 }
 
-//public Action OnLevelInit(const char[] mapName, char mapEntities[2097152]) {
-//	bPuzzleMap = (StrContains(mapName, "puzzle_")>=0);
-//	return (bPuzzleMap && ScanOutputs(mapEntities)) ? Plugin_Changed : Plugin_Continue;
-//}
-
-
 public void OnMapStart() {
 	PrecacheModel(DUMMY_MODEL);
 	PrecacheSound(GH_SOUND_PICKUP);
@@ -346,7 +340,7 @@ public Action OnNotifyGravihandsActive(Handle timer) {
 /** convar **/
 
 void CreateConvars() {
-	ConVar version = CreateConVar("tf2gravihands_version", PLUGIN_VERSION, "TF2 Puzzle Version", FCVAR_NOTIFY|FCVAR_DONTRECORD);
+	ConVar version = CreateConVar("tf2gravihands_version", PLUGIN_VERSION, "TF2 Gravity Hands Version", FCVAR_NOTIFY|FCVAR_DONTRECORD);
 	version.AddChangeHook(OnCVarLockedChange);
 
 	cvarGraviHandsMaxWeight = CreateConVar("tf2gravihands_maxmass", "250.0", _, _, true, 0.0);

tf2gravihands_prophandling.sp

@@ -87,8 +87,11 @@ static void computeBounds(int entity, float mins[3], float maxs[3]) {
 	Entity_GetMinSize(entity, mins);
 	Entity_GetMaxSize(entity, maxs);
 	AddVectors(mins,maxs,mins);
-	ScaleVector(mins,0.5); //mins = now COM
-	
+	ScaleVector(mins,0.5); //mins = now Center
+	//now rotate with the prop
+	float r[3];
+	Entity_GetAbsAngles(entity, r);
+	Math_RotateVector(mins, r, mins);
 	//create equidistant box to keep origin of prop in world
 	AddVectors(mins,v,maxs);
 	SubtractVectors(mins,v,mins);
@@ -102,7 +105,6 @@ static int pew(int client, float targetPoint[3], float scanDistance) {
 	float eyePos[3], eyeAngles[3], fwrd[3];
 	GetClientEyePosition(client, eyePos);
 	GetClientEyeAngles(client, eyeAngles);
-//	GetAngleVectors(eyeAngles, fwrd, NULL_VECTOR, NULL_VECTOR);
 	Handle trace = TR_TraceRayFilterEx(eyePos, eyeAngles, MASK_SOLID, RayType_Infinite, grabFilter, client);
 	int cursor = INVALID_ENT_REFERENCE;
 	if(TR_DidHit(trace)) {
@@ -128,30 +130,14 @@ static int pew(int client, float targetPoint[3], float scanDistance) {
 	return cursor;
 }
 
-//public bool seeCenterFilter(int entity, int contentsMask, int prop) {
-//	return !entity || (entity > MaxClients && entity != prop);
-//}
-//
-//static bool checkPropCenterVisible(int client, int prop) {
-//	//require los to COM to be unobstructed
-//	float vec1[3], vec2[3];
-//	Entity_GetMinSize(prop, vec1);
-//	Entity_GetMaxSize(prop, vec2);
-//	AddVectors(vec1, vec2, vec1);
-//	ScaleVector(vec1, 0.5);
-//	GetClientEyePosition(client, vec2);
-//	TR_TraceRayFilter(vec1, vec2, MASK_SOLID, RayType_EndPoint, seeCenterFilter, prop);
-//	return !TR_DidHit();
-//}
-
 static bool movementCollides(int client, float endpos[3], bool onlyTarget) {
 	//check if prop would collide at target position
 	float offset[3], from[3], to[3], mins[3], maxs[3];
 	int grabbed = EntRefToEntIndex(GravHand[client].grabbedEnt);
 	if (grabbed == INVALID_ENT_REFERENCE) ThrowError("%L is not currently grabbing anything", client);
 	//get movement
 	SubtractVectors(endpos, GravHand[client].lastValid, offset);
-	Entity_GetAbsOrigin(grabbed, from);
+	GetEntPropVector(grabbed, Prop_Data, "m_vecAbsOrigin", from);
 	AddVectors(from, offset, to);
 	if (onlyTarget) {
 		from[0]=to[0]-0.1;
@@ -160,9 +146,8 @@ static bool movementCollides(int client, float endpos[3], bool onlyTarget) {
 	}
 	computeBounds(grabbed, mins, maxs);
 	//trace it
-	Handle trace = TR_TraceHullFilterEx(from, to, mins, maxs, MASK_SOLID, grabFilter, client);
-	bool result = TR_DidHit(trace);
-	delete trace;
+	TR_TraceHullFilter(from, to, mins, maxs, MASK_SOLID, grabFilter, client);
+	bool result = TR_DidHit();
 	return result;
 }
 
@@ -171,8 +156,6 @@ static bool movementCollides(int client, float endpos[3], bool onlyTarget) {
  * have to check if gravity hands are out.
  */
 bool clientCmdHoldProp(int client, int &buttons, float velocity[3], float angles[3]) {
-//	float yawAngle[3];
-//	yawAngle[1] = angles[1];
 	if ((buttons & IN_ATTACK2) && !GravHand[client].forceDropProp) {
 		if (GetEntPropFloat(client, Prop_Send, "m_flNextAttack") - GetGameTime() < 0.1) {
 			SetEntPropFloat(client, Prop_Send, "m_flNextAttack", GetGameTime() + 0.5);
@@ -198,7 +181,6 @@ bool clientCmdHoldProp(int client, int &buttons, float velocity[3], float angles
 		}
 		return true;
 	} else if (!(buttons & IN_ATTACK2)) {
-//		SetEntPropFloat(client, Prop_Send, "m_flFirstPrimaryAttack", GetGameTime()+0.5);
 		SetEntPropFloat(client, Prop_Send, "m_flNextAttack", GetGameTime());
 		buttons &=~ IN_ATTACK2;
 	}
@@ -301,9 +283,10 @@ static bool TryPickupCursorEnt(int client, float yawAngle[3]) {
 	TeleportEntity(cursorEnt, NULL_VECTOR, NULL_VECTOR, killVelocity);
 	//grab entity
 	GravHand[client].grabbedEnt = EntIndexToEntRef(cursorEnt);
-	float vec[3];
+	float vec[3], vec2[3];
 	GetClientEyePosition(client, vec);
-	GravHand[client].grabDistance = Entity_GetDistanceOrigin(rotProxy, vec);
+	GetEntPropVector(rotProxy, Prop_Data, "m_vecAbsOrigin", vec2);
+	GravHand[client].grabDistance = GetVectorDistance(vec2, vec);
 	//parent to make rotating easier
 	SetVariantString("!activator");
 	AcceptEntityInput(cursorEnt, "SetParent", rotProxy);
@@ -392,7 +375,7 @@ bool ForceDropItem(int client, bool punt=false, const float dvelocity[3]=NULL_VE
 	int entity;
 	if ((entity = EntRefToEntIndex(GravHand[client].grabbedEnt))!=INVALID_ENT_REFERENCE) {
 		float vec[3], origin[3];
-		Entity_GetAbsOrigin(entity, origin);
+		GetEntPropVector(entity, Prop_Data, "m_vecAbsOrigin", origin);
 		AcceptEntityInput(entity, "ClearParent");
 		//fling
 		bool didPunt;
@@ -401,7 +384,6 @@ bool ForceDropItem(int client, bool punt=false, const float dvelocity[3]=NULL_VE
 			GetAngleVectors(dvangles, vec, NULL_VECTOR, NULL_VECTOR);
 			ScaleVector(vec, gGraviHandsPuntForce * 100.0 / Phys_GetMass(entity));
 //				AddVectors(vec, fwd, vec);
-//			PrintToServer("Punting Prop with Mass %f", Phys_GetMass(entity));
 			didPunt=true;
 		} else if (!movementCollides(client, vec, false)) { //throw with swing
 			SubtractVectors(vec, GravHand[client].previousEnd, vec);
@@ -411,8 +393,8 @@ bool ForceDropItem(int client, bool punt=false, const float dvelocity[3]=NULL_VE
 		}
 		if (!IsNullVector(dvelocity)) AddVectors(vec, dvelocity, vec);
 		float zeros[3];
-		TeleportEntity(entity, origin, NULL_VECTOR, zeros); //rest entity
-		Phys_AddVelocity(entity, vec, zeros);//use vphysics to accelerate, is more stable
+		TeleportEntity(entity, origin, NULL_VECTOR, zeros); //reset entity
+		Phys_SetVelocity(entity, vec, zeros, true);//use vphysics to accelerate, is more stable
 
 		//fire output that the ent was dropped
 		{	char classname[64];
@@ -430,7 +412,7 @@ bool ForceDropItem(int client, bool punt=false, const float dvelocity[3]=NULL_VE
 		didStuff = true;
 	}
 	if ((entity = EntRefToEntIndex(GravHand[client].rotProxyEnt))!=INVALID_ENT_REFERENCE) {
-		RequestFrame(killEntity, entity);
+		AcceptEntityInput(entity, "Kill");
 		GravHand[client].rotProxyEnt = INVALID_ENT_REFERENCE;
 		didStuff = true;
 	}
@@ -472,11 +454,6 @@ void PlayActionSound(int client, int sound) {
 	}
 }
 
-static void killEntity(int entity) {
-	if (IsValidEntity(entity))
-		AcceptEntityInput(entity, "Kill");
-}
-
 bool FixPhysPropAttacker(int victim, int& attacker, int& inflictor, int& damagetype) {
 	if (attacker == inflictor && victim != attacker && !IsValidClient(attacker)) {
 		char classname[64];

tf2gravihands_weapons.sp

@@ -62,20 +62,23 @@ int EquipPlayerMelee(int client, int definitionIndex, int level=9000, int qualit
 }
 
 bool HolsterMelee(int client) {
-	if (!IsValidClient(client, false))
+	if (!IsValidClient(client, false)) {
 		return false; //not for bots
-	if (player[client].holsteredWeapon != INVALID_ITEM_DEFINITION) 
+	}
+	if (player[client].holsteredWeapon != INVALID_ITEM_DEFINITION) {
 		return false; //already holstered
-	if (player[client].weaponsStripped)
+	}
+	if (player[client].weaponsStripped) {
 		return false; //wow hey, don't holster grav hands
+	}
 
 	int active = Client_GetActiveWeapon(client);
-	int melee = GetPlayerWeaponSlot(client, TFWeaponSlot_Melee);
+	int melee = Client_GetWeaponBySlot(client, TFWeaponSlot_Melee);
 	bool switchTo = (melee == INVALID_ENT_REFERENCE || active != melee); //if melee was not active switch, to holster guns
-	int holsterIndex = melee == INVALID_ENT_REFERENCE 
-		? INVALID_ITEM_DEFINITION
-		: GetEntProp(melee, Prop_Send, "m_iItemDefinitionIndex");
-	
+	int holsterIndex = INVALID_ITEM_DEFINITION;
+	if (melee != INVALID_ENT_REFERENCE) { 
+		holsterIndex = GetEntProp(melee, Prop_Send, "m_iItemDefinitionIndex");
+	}
 	if ((GetClientButtons(client) & (IN_ATTACK|IN_ATTACK2))!=0) {
 		//holstering while healing someone breaks the medic beam (infinite heal)
 		PrintToChat(client, "[SM] You can not holster while holding attack buttons!");
@@ -101,7 +104,7 @@ bool HolsterMelee(int client) {
 	//needs to be set after Equip call due to event order
 	player[client].holsteredWeapon = holsterIndex;
 	if (switchTo) Client_SetActiveWeapon(client, fists);
-		
+	
 	NotifyWeaponHolsterPost(client, holsterIndex);
 	return true;
 }
@@ -113,13 +116,15 @@ void UnholsterMelee(int client) {
 	RequestFrame(ActualUnholsterMelee, client);
 }
 void ActualUnholsterMelee(int client) {
-	if (!IsValidClient(client, false))
+	if (!IsValidClient(client, false)) {
 		return; //not for bots
-	if (player[client].holsteredWeapon == INVALID_ITEM_DEFINITION || player[client].weaponsStripped)
+	}
+	if (player[client].holsteredWeapon == INVALID_ITEM_DEFINITION || player[client].weaponsStripped) {
 		return; //no weapon holstered
-	
-	if (!NotifyWeaponUnholster(client, player[client].holsteredWeapon))
+	}
+	if (!NotifyWeaponUnholster(client, player[client].holsteredWeapon)) {
 		return; //was cancelled
+	}
 
 	int restore = player[client].holsteredWeapon;
 	player[client].holsteredWeapon = INVALID_ITEM_DEFINITION;
@@ -130,6 +135,7 @@ void ActualUnholsterMelee(int client) {
 			player[client].holsteredAttributeCount,
 			player[client].holsteredAttributeIds,
 			player[client].holsteredAttributeValues);
+		player[client].holsteredWeapon = INVALID_ITEM_DEFINITION;
 	}
 	NotifyWeaponUnholsterPost(client, restore, false);
 }