jackz/sourcemod-plugins
1
0
Fork 0
mirror of https://github.com/Jackzmc/sourcemod-plugins.git synced 2025-05-09 17:33:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix manual target being wrong entity

Browse source
This commit is contained in:
Jackz 2022-08-24 11:00:43 -05:00
parent 5a5ea13756
commit 0e7a48b609
No known key found for this signature in database
GPG key ID: E0BBD94CF657F603
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
plugins/l4d2_turret.smx
View file

Binary file not shown.

5
scripting/l4d2_turret.sp
View file

@ -231,6 +231,7 @@ public Action OnTakeDamageAlive(int victim, int& attacker, int& inflictor, float
} }
public void OnMapEnd() { public void OnMapEnd() {
manualTarget = -1;
ClearTurrets(); ClearTurrets();
} }
@ -261,7 +262,7 @@ public void OnEntityDestroyed(int entity) {
public Action Command_SpawnTurret(int client, int args) { public Action Command_SpawnTurret(int client, int args) {
float pos[3]; float pos[3];
GetClientEyePosition(client, pos); GetClientEyePosition(client, pos);
pos[2] += 20.0; pos[2] += 40.0;
int base = CreateParticleNamed(ENT_PORTAL_NAME, PARTICLE_ELMOS, pos, NULL_VECTOR); int base = CreateParticleNamed(ENT_PORTAL_NAME, PARTICLE_ELMOS, pos, NULL_VECTOR);
SetupTurret(base, TURRET_ACTIVATION_TIME); SetupTurret(base, TURRET_ACTIVATION_TIME);
ReplyToCommand(client, "New turret (%d) will activate in %.0f seconds", base, TURRET_ACTIVATION_TIME); ReplyToCommand(client, "New turret (%d) will activate in %.0f seconds", base, TURRET_ACTIVATION_TIME);
@ -642,7 +643,7 @@ public Action OnPlayerRunCmd(int client, int& buttons, int& impulse, float vel[3
// Run a ray trace to find a suitable position // Run a ray trace to find a suitable position
// TODO: Possibly run per-turret for more accurate preview... but it's already lag fest // TODO: Possibly run per-turret for more accurate preview... but it's already lag fest
TR_TraceRayFilter(orgPos, angles, MASK_SHOT, RayType_Infinite, Filter_ManualTarget); TR_TraceRayFilter(orgPos, angles, MASK_SHOT, RayType_Infinite, Filter_ManualTarget);
if(!IsValidEntity(manualTarget)) manualTarget = CreateTarget(aimPos, MANUAL_TARGETNAME); if(manualTarget <= 0 || !IsValidEntity(manualTarget)) manualTarget = CreateTarget(aimPos, MANUAL_TARGETNAME);
// Disable aim snapping if player is holding WALK (which is apparently IN_SPEED) // Disable aim snapping if player is holding WALK (which is apparently IN_SPEED)
bool aimSnapping = ~buttons & IN_SPEED > 0; bool aimSnapping = ~buttons & IN_SPEED > 0;