ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-26 14:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverted changes to revision 45.

Browse source 
git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@77 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2005-04-13 23:16:00 +00:00
parent cbd7e95495
commit 045b7f22c5
1 changed files with 1 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
main/source/mod/AvHPlayer.cpp
View file

@ -1208,10 +1208,6 @@ bool AvHPlayer::ExecuteMessage(AvHMessageID inMessageID, bool inInstantaneous, b
this->PayPurchaseCost(theCost); this->PayPurchaseCost(theCost);
} }
// tankefugl: 0000971
int theIssuedOrderIcon = -1;
// :tankefugl
if(theIsMarine if(theIsMarine
&& !theIsInTopDownMode && !theIsInTopDownMode
&& !theIsBeingDigested) && !theIsBeingDigested)
@ -1254,21 +1250,6 @@ bool AvHPlayer::ExecuteMessage(AvHMessageID inMessageID, bool inInstantaneous, b
{ {
switch(inMessageID) switch(inMessageID)
{ {
// tankefugl: 0000971
// decides whether icon updates should be sent
case SAYING_1:
theIssuedOrderIcon = TEAMMATE_MARINE_ORDER_FOLLOW;
break;
case SAYING_2:
theIssuedOrderIcon = TEAMMATE_MARINE_ORDER_COVER;
break;
case SAYING_8:
theIssuedOrderIcon = TEAMMATE_MARINE_ORDER_WELD;
break;
// :tankefugl
case SAYING_5: case SAYING_5:
theAlertType = ALERT_SOLDIER_NEEDS_AMMO; theAlertType = ALERT_SOLDIER_NEEDS_AMMO;
theMessageID = COMMANDER_NEXTAMMO; theMessageID = COMMANDER_NEXTAMMO;
@ -1328,74 +1309,6 @@ bool AvHPlayer::ExecuteMessage(AvHMessageID inMessageID, bool inInstantaneous, b
theMessageExecuted = true; theMessageExecuted = true;
break; break;
} }
// tankefugl: 0000971
// decides whether icon updates should be sent
switch (inMessageID)
{
case SAYING_1:
theIssuedOrderIcon = TEAMMATE_ALIEN_ORDER_FOLLOW;
break;
case SAYING_2:
theIssuedOrderIcon = TEAMMATE_ALIEN_ORDER_COVER;
break;
case SAYING_4:
case SAYING_8:
theIssuedOrderIcon = TEAMMATE_ALIEN_ORDER_HEAL;
break;
}
// :tankefugl
}
// tankefugl: 0000971 and 0000992
if (theIssuedOrderIcon > -1)
{
int theOrderTarget = 0;
vec3_t vecDir;
VectorCopy(this->GetAutoaimVector(0.0f), vecDir);
VectorNormalize(vecDir);
FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*);
float dotResult = 0.0f;
float currentResult = 0.0f;
float theDistance = 0.0f;
vec3_t vecOrigin;
vec3_t vecDistance;
if (theEntity->GetTeam() == this->GetTeam())
{
VectorSubtract(theEntity->pev->origin, this->pev->origin, vecDistance);
theDistance = Length(vecDistance);
VectorNormalize(vecDistance);
dotResult = DotProduct(vecDistance, vecDir);
if ((dotResult > 0.8f) && (dotResult > currentResult))
{
currentResult = dotResult;
theOrderTarget = theEntity->entindex();
}
}
// ALERT(at_console, "-------------------\n");
// ALERT(at_console, UTIL_VarArgs("vecDir %f %f %f\n", vecDir[0], vecDir[1], vecDir[2]));
// ALERT(at_console, UTIL_VarArgs("vecDistance %f %f %f\n", vecDistance[0], vecDistance[1], vecDistance[2]));
// ALERT(at_console, UTIL_VarArgs("dotResult %f\n", dotResult));
// ALERT(at_console, UTIL_VarArgs("currentResult %f\n", currentResult));
END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
// ALERT(at_console, UTIL_VarArgs("theIssuedOrderIcon %d source %d target %d\n", theIssuedOrderIcon, this->entindex(), theOrderTarget));
FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*);
if(theEntity->GetTeam() == this->GetTeam())
{
NetMsg_IssueOrder(theEntity->pev, theIssuedOrderIcon, this->entindex(), theOrderTarget);
}
END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
// Send icon number only to players on the same team
// TODO 0000992:
// Perform a trace to find nearest player in crosshair
// Send issued order to found player
} }
// Common messages here // Common messages here