ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-29 15:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mantis 0000992:

Browse source 
o Teammate popup now uses the second set of sprites, with the brackets on the side
o Added LOS check for order targets
o Fixed bug where it would not select the correct target for the teammate orders

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@58 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2005-04-11 01:22:08 +00:00
parent af6038ae21
commit 9a4f8002d6
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/tankefugl/source/mod/AvHHudRender.cpp
View file

@ -1181,7 +1181,7 @@ void AvHHud::DrawDisplayOrder()
if (this->mDisplayOrderType == 1) if (this->mDisplayOrderType == 1)
{ {
AvHSpriteDraw(this->mTeammateOrderSprite, this->mDisplayOrderIndex, mIconX1, mIconY1, mIconX2, mIconY2, 0, 0, 1, 1); AvHSpriteDraw(this->mTeammateOrderSprite, this->mDisplayOrderIndex + 8, mIconX1, mIconY1, mIconX2, mIconY2, 0, 0, 1, 1);
this->DrawHudStringCentered(mTextX1, mIconY2, ScreenWidth(), this->mDisplayOrderText1.c_str(), r, g, b); this->DrawHudStringCentered(mTextX1, mIconY2, ScreenWidth(), this->mDisplayOrderText1.c_str(), r, g, b);
} }
else if (this->mDisplayOrderType == 2) else if (this->mDisplayOrderType == 2)

27
dev/tankefugl/source/mod/AvHPlayer.cpp
View file

@ -1355,31 +1355,40 @@ bool AvHPlayer::ExecuteMessage(AvHMessageID inMessageID, bool inInstantaneous, b
VectorCopy(this->GetAutoaimVector(0.0f), vecDir); VectorCopy(this->GetAutoaimVector(0.0f), vecDir);
VectorNormalize(vecDir); VectorNormalize(vecDir);
float currentResult = 0.0f;
FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*); FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*);
float dotResult = 0.0f; float dotResult = 0.0f;
float currentResult = 0.0f;
float theDistance = 0.0f; float theDistance = 0.0f;
vec3_t vecOrigin;
vec3_t vecDistance; vec3_t vecDistance;
int theTraced = 0;
if (theEntity->GetTeam() == this->GetTeam()) if (theEntity->GetTeam() == this->GetTeam())
{ {
VectorSubtract(theEntity->pev->origin, this->pev->origin, vecDistance); VectorSubtract(theEntity->pev->origin, this->pev->origin, vecDistance);
theDistance = Length(vecDistance); // theDistance = Length(vecDistance);
VectorNormalize(vecDistance); VectorNormalize(vecDistance);
dotResult = DotProduct(vecDistance, vecDir); dotResult = DotProduct(vecDistance, vecDir);
if ((dotResult > 0.8f) && (dotResult > currentResult)) if ((dotResult > 0.9f) && (dotResult > currentResult))
{ {
TraceResult theTrace;
UTIL_TraceLine(this->pev->origin, theEntity->pev->origin, dont_ignore_monsters, NULL, &theTrace);
if (theTrace.flFraction == 1.0f)
{
theTraced = 1;
currentResult = dotResult; currentResult = dotResult;
theOrderTarget = theEntity->entindex(); 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, "-------------------\n");
// ALERT(at_console, UTIL_VarArgs("vecDistance %f %f %f\n", vecDistance[0], vecDistance[1], vecDistance[2])); ALERT(at_console, UTIL_VarArgs("vecDir %f %f %f\n", vecDir[0], vecDir[1], vecDir[2]));
// ALERT(at_console, UTIL_VarArgs("dotResult %f\n", dotResult)); ALERT(at_console, UTIL_VarArgs("vecDistance %f %f %f\n", vecDistance[0], vecDistance[1], vecDistance[2]));
// ALERT(at_console, UTIL_VarArgs("currentResult %f\n", currentResult)); ALERT(at_console, UTIL_VarArgs("dotResult %f\n", dotResult));
ALERT(at_console, UTIL_VarArgs("currentResult %f\n", currentResult));
ALERT(at_console, UTIL_VarArgs("theTraced %d\n", theTraced));
ALERT(at_console, UTIL_VarArgs("theOrderTarget %d\n", theOrderTarget));
END_FOR_ALL_ENTITIES(kAvHPlayerClassName); END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
// ALERT(at_console, UTIL_VarArgs("theIssuedOrderIcon %d source %d target %d\n", theIssuedOrderIcon, this->entindex(), theOrderTarget)); // ALERT(at_console, UTIL_VarArgs("theIssuedOrderIcon %d source %d target %d\n", theIssuedOrderIcon, this->entindex(), theOrderTarget));