GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 06:15:37 +03:00
Code Issues Projects Releases Wiki Activity

Updated twisty's code

Browse Source
This commit is contained in:
David Anderson 2005-07-30 01:51:12 +00:00
parent 75b63da66f
commit 431eb72518
1 changed files with 15 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
dlls/engine/engine.cpp
View File

@ -953,10 +953,10 @@ static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params) // (string, retur
//contributed by twistedeuphoria //contributed by twistedeuphoria
static cell AMX_NATIVE_CALL trace_forward(AMX *amx, cell *params) static cell AMX_NATIVE_CALL trace_forward(AMX *amx, cell *params)
//native trace_forward(Float:start[3], Float:angle, Float:give, ignoreEnt, &Float:hitX, &Float:hitY, &Float:shortestDistance, &Float:shortestDistLow, &Float:shortestDistHigh) //native trace_forward(Float:start[3], Float:angles[3], give, ignoreEnt, &Float:hitX, &Float:hitY, &Float:shortestDistance, &Float:shortestDistLow, &Float:shortestDistHigh)
{ {
cell *cStart = MF_GetAmxAddr(amx, params[1]); cell *cStart = MF_GetAmxAddr(amx, params[1]);
REAL fAngle = amx_ctof(params[2]); cell *cAngles = MF_GetAmxAddr(amx, params[2]);
REAL fGive = amx_ctof(params[3]); REAL fGive = amx_ctof(params[3]);
int iIgnoreEnt = params[4]; int iIgnoreEnt = params[4];
cell *hitX = MF_GetAmxAddr(amx, params[5]); cell *hitX = MF_GetAmxAddr(amx, params[5]);
@ -967,69 +967,22 @@ static cell AMX_NATIVE_CALL trace_forward(AMX *amx, cell *params)
if(fGive < 0.0) if(fGive < 0.0)
fGive = 20.0; fGive = 20.0;
fAngle -= 90.0;
if(fAngle < 0.0)
fAngle += 360.0;
REAL fRadians = M_PI * fAngle;
fRadians /= 180.0;
REAL fTanResult = tan(fRadians);
REAL fStartX = amx_ctof(cStart[0]); REAL fStartX = amx_ctof(cStart[0]);
REAL fStartY = amx_ctof(cStart[1]); REAL fStartY = amx_ctof(cStart[1]);
REAL fStartZ = amx_ctof(cStart[2]); REAL fStartZ = amx_ctof(cStart[2]);
REAL fEndX = -1.0;
REAL fEndY = -1.0; REAL fAnglesX = amx_ctof(cAngles[0]);
if((fAngle == 0.0) || (fAngle == 360.0)) REAL fAnglesY = amx_ctof(cAngles[1]);
{ REAL fAnglesZ = amx_ctof(cAngles[2]);
fEndX = fStartX; Vector playerAngleVector = Vector(fAnglesX,fAnglesY,fAnglesZ);
fEndY = 4000; MAKE_VECTORS(playerAngleVector);
}
else if(fAngle == 90.0) Vector forwardVector = gpGlobals->v_forward;
{ REAL fEndX = forwardVector[0] * 4000;
fEndX = 4000; REAL fEndY = forwardVector[1] * 4000;
fEndY = fStartY; REAL fEndZ = fStartZ;
}
else if(fAngle == 180.0)
{
fEndX = -4000;
fEndY = fStartY;
}
else if(fAngle == 270.0)
{
fEndX = fStartX;
fEndY = -4000;
}
if((fAngle > 0.0) && (fAngle < 180.0) && (fEndX == -1.0))
fEndX = fStartX - 4000;
else if(fEndX == -1.0)
fEndX = fStartX + 4000;
if(fEndY == -1.0)
fEndY = fStartY + (4000.0 * fTanResult);
if((fAngle > 0.0) && (fAngle < 90.0))
{
REAL tempSlot = fEndX;
fEndX = fEndY * -1.0;
fEndY = tempSlot * -1.0;
}
if((fAngle > 90.0) && (fAngle < 180.0))
{
REAL tempSlot = fEndX;
fEndX = fEndY * -1.0;
fEndY = tempSlot;
}
if((fAngle > 180.0) && (fAngle < 270.0))
{
REAL tempSlot = fEndX;
fEndX = fEndY;
fEndY = tempSlot;
fEndY *= -1.0;
}
if((fAngle > 270.0) && (fAngle < 360.0))
{
REAL tempSlot = fEndX;
fEndX = fEndY;
fEndY = tempSlot;
}
REAL fClosestDist = 999999.9; REAL fClosestDist = 999999.9;
REAL fClosestLow = 0.0; REAL fClosestLow = 0.0;
REAL fClosestHigh = 0.0; REAL fClosestHigh = 0.0;
@ -1055,7 +1008,6 @@ static cell AMX_NATIVE_CALL trace_forward(AMX *amx, cell *params)
Vector vHit = Vector(fRetX, fRetY, fRetZ); Vector vHit = Vector(fRetX, fRetY, fRetZ);
REAL fLength = (vStart - vHit).Length(); REAL fLength = (vStart - vHit).Length();
if(fLength < 20.0) continue;
if(fabs(fLength - fClosestDist) < fGive) if(fabs(fLength - fClosestDist) < fGive)
fClosestHigh = fUseZ - fStartZ; fClosestHigh = fUseZ - fStartZ;
else if(fLength < fClosestDist) else if(fLength < fClosestDist)