sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-07 10:28:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

only show 'In End/Start Zone' for zones of your track

Browse Source
This commit is contained in:
rtldg 2021-09-08 17:43:08 +00:00
parent bf9b73180f
commit ef5bf0c460
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/sourcemod/scripting/shavit-hud.sp
View File

@ -1193,7 +1193,7 @@ int AddHUDToBuffer_Source2013(int client, huddata_t data, char[] buffer, int max
char limit[16]; char limit[16];
Shavit_GetStyleSetting(data.iStyle, "velocity_limit", limit, 16); Shavit_GetStyleSetting(data.iStyle, "velocity_limit", limit, 16);
if(StringToFloat(limit) > 0.0 && Shavit_InsideZone(data.iTarget, Zone_CustomSpeedLimit, -1)) if(StringToFloat(limit) > 0.0 && Shavit_InsideZone(data.iTarget, Zone_CustomSpeedLimit, data.iTrack))
{ {
if(gI_ZoneSpeedLimit[data.iTarget] == 0) if(gI_ZoneSpeedLimit[data.iTarget] == 0)
{ {
@ -1469,42 +1469,38 @@ void UpdateMainHUD(int client)
float fSpeedHUD = ((gI_HUDSettings[client] & HUD_2DVEL) == 0)? GetVectorLength(fSpeed):(SquareRoot(Pow(fSpeed[0], 2.0) + Pow(fSpeed[1], 2.0))); float fSpeedHUD = ((gI_HUDSettings[client] & HUD_2DVEL) == 0)? GetVectorLength(fSpeed):(SquareRoot(Pow(fSpeed[0], 2.0) + Pow(fSpeed[1], 2.0)));
ZoneHUD iZoneHUD = ZoneHUD_None; ZoneHUD iZoneHUD = ZoneHUD_None;
int iReplayStyle = 0;
int iReplayTrack = 0;
float fReplayTime = 0.0; float fReplayTime = 0.0;
float fReplayLength = 0.0; float fReplayLength = 0.0;
huddata_t huddata;
huddata.iStyle = (bReplay) ? Shavit_GetReplayBotStyle(target) : Shavit_GetBhopStyle(target);
huddata.iTrack = (bReplay) ? Shavit_GetReplayBotTrack(target) : Shavit_GetClientTrack(target);
if(!bReplay) if(!bReplay)
{ {
if(Shavit_InsideZone(target, Zone_Start, -1)) if (Shavit_InsideZone(target, Zone_Start, huddata.iTrack))
{ {
iZoneHUD = ZoneHUD_Start; iZoneHUD = ZoneHUD_Start;
} }
else if(Shavit_InsideZone(target, Zone_End, -1)) else if (Shavit_InsideZone(target, Zone_End, huddata.iTrack))
{ {
iZoneHUD = ZoneHUD_End; iZoneHUD = ZoneHUD_End;
} }
} }
else else
{ {
iReplayStyle = Shavit_GetReplayBotStyle(target); if (huddata.iStyle != -1)
iReplayTrack = Shavit_GetReplayBotTrack(target);
if(iReplayStyle != -1)
{ {
fReplayTime = Shavit_GetReplayTime(target); fReplayTime = Shavit_GetReplayTime(target);
fReplayLength = Shavit_GetReplayCacheLength(target); fReplayLength = Shavit_GetReplayCacheLength(target);
fSpeedHUD /= Shavit_GetStyleSettingFloat(iReplayStyle, "speed") * Shavit_GetStyleSettingFloat(iReplayStyle, "timescale"); fSpeedHUD /= Shavit_GetStyleSettingFloat(huddata.iStyle, "speed") * Shavit_GetStyleSettingFloat(huddata.iStyle, "timescale");
} }
} }
huddata_t huddata;
huddata.iTarget = target; huddata.iTarget = target;
huddata.iSpeed = RoundToNearest(fSpeedHUD); huddata.iSpeed = RoundToNearest(fSpeedHUD);
huddata.iZoneHUD = iZoneHUD; huddata.iZoneHUD = iZoneHUD;
huddata.iStyle = (bReplay)? iReplayStyle:Shavit_GetBhopStyle(target);
huddata.iTrack = (bReplay)? iReplayTrack:Shavit_GetClientTrack(target);
huddata.fTime = (bReplay)? fReplayTime:Shavit_GetClientTime(target); huddata.fTime = (bReplay)? fReplayTime:Shavit_GetClientTime(target);
huddata.iJumps = (bReplay)? 0:Shavit_GetClientJumps(target); huddata.iJumps = (bReplay)? 0:Shavit_GetClientJumps(target);
huddata.iStrafes = (bReplay)? 0:Shavit_GetStrafeCount(target); huddata.iStrafes = (bReplay)? 0:Shavit_GetStrafeCount(target);
@ -1883,6 +1879,7 @@ void UpdateKeyHint(int client)
return; return;
} }
int track = bReplay ? Shavit_GetReplayBotTrack(target) : Shavit_GetClientTrack(target);
int style = bReplay ? Shavit_GetReplayBotStyle(target) : Shavit_GetBhopStyle(target); int style = bReplay ? Shavit_GetReplayBotStyle(target) : Shavit_GetBhopStyle(target);
if(!(0 <= style < gI_Styles)) if(!(0 <= style < gI_Styles))
@ -1896,7 +1893,7 @@ void UpdateKeyHint(int client)
char autobhop[4]; char autobhop[4];
Shavit_GetStyleSetting(style, "autobhop", autobhop, 4); Shavit_GetStyleSetting(style, "autobhop", autobhop, 4);
if(!bReplay && (gI_HUDSettings[client] & HUD_SYNC) > 0 && Shavit_GetTimerStatus(target) == Timer_Running && StringToInt(sync) && (!gB_Zones || !Shavit_InsideZone(target, Zone_Start, -1))) if(!bReplay && (gI_HUDSettings[client] & HUD_SYNC) > 0 && Shavit_GetTimerStatus(target) == Timer_Running && StringToInt(sync) && (!gB_Zones || !Shavit_InsideZone(target, Zone_Start, track)))
{ {
Format(sMessage, 256, "%s%s%T: %.01f", sMessage, (strlen(sMessage) > 0)? "\n\n":"", "HudSync", client, Shavit_GetSync(target)); Format(sMessage, 256, "%s%s%T: %.01f", sMessage, (strlen(sMessage) > 0)? "\n\n":"", "HudSync", client, Shavit_GetSync(target));