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

make freestyle zones also work for +use blocks

Browse Source
This commit is contained in:
shavitush 2016-06-20 20:09:39 +03:00
parent 4ede31f957
commit 7054795b4c
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
scripting/shavit-core.sp
View File

@ -855,42 +855,50 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
bool bOnGround = GetEntityFlags(client) & FL_ONGROUND || bOnLadder;
// key blocking
if(!Shavit_InsideZone(client, Zone_Freestyle) && !bOnGround)
if(!Shavit_InsideZone(client, Zone_Freestyle))
{
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_W && (vel[0] > 0 || buttons & IN_FORWARD))
// block E
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_USE && buttons & IN_USE)
{
vel[0] = 0.0;
buttons &= ~IN_FORWARD;
buttons &= ~IN_USE;
}
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_A && (vel[1] < 0 || buttons & IN_MOVELEFT))
if(!bOnGround)
{
vel[1] = 0.0;
buttons &= ~IN_MOVELEFT;
}
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_W && (vel[0] > 0 || buttons & IN_FORWARD))
{
vel[0] = 0.0;
buttons &= ~IN_FORWARD;
}
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_S && (vel[0] < 0 || buttons & IN_BACK))
{
vel[0] = 0.0;
buttons &= ~IN_BACK;
}
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_A && (vel[1] < 0 || buttons & IN_MOVELEFT))
{
vel[1] = 0.0;
buttons &= ~IN_MOVELEFT;
}
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_D && (vel[1] > 0 || buttons & IN_MOVERIGHT))
{
vel[1] = 0.0;
buttons &= ~IN_MOVERIGHT;
}
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_S && (vel[0] < 0 || buttons & IN_BACK))
{
vel[0] = 0.0;
buttons &= ~IN_BACK;
}
// HSW
if(gI_StyleProperties[gBS_Style[client]] & STYLE_HSW_ONLY && (vel[0] == 0.0 || !((vel[0] > 0 || buttons & IN_FORWARD) && ((vel[1] < 0 || buttons & IN_MOVELEFT) || (vel[1] > 0 || buttons & IN_MOVERIGHT)))))
{
vel[1] = 0.0;
buttons &= ~IN_MOVELEFT;
buttons &= ~IN_MOVERIGHT;
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_D && (vel[1] > 0 || buttons & IN_MOVERIGHT))
{
vel[1] = 0.0;
buttons &= ~IN_MOVERIGHT;
}
// HSW
if(gI_StyleProperties[gBS_Style[client]] & STYLE_HSW_ONLY && (vel[0] == 0.0 || !((vel[0] > 0 || buttons & IN_FORWARD) && ((vel[1] < 0 || buttons & IN_MOVELEFT) || (vel[1] > 0 || buttons & IN_MOVERIGHT)))))
{
vel[1] = 0.0;
buttons &= ~IN_MOVELEFT;
buttons &= ~IN_MOVERIGHT;
}
}
}
if(Shavit_InsideZone(client, Zone_Start) && gCV_BlockPreJump.BoolValue && !(gI_StyleProperties[gBS_Style[client]] & STYLE_PRESPEED))
{
if(vel[2] > 0 || buttons & IN_JUMP)
@ -930,12 +938,6 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
gB_OnGround[client] = false;
}
// block +use
if(gI_StyleProperties[gBS_Style[client]] & STYLE_BLOCK_USE && buttons & IN_USE)
{
buttons &= ~IN_USE;
}
if(gB_ClientPaused[client])
{
vel = view_as<float>({0.0, 0.0, 0.0});