Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/game/client/c_baseplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#ifdef NEO
#include "c_neo_player.h"
#include "weapon_tachi.h"
#include "weapon_supa7.h"
#include "ivieweffects.h"
#endif

Expand Down Expand Up @@ -2611,7 +2612,9 @@ void C_BasePlayer::PhysicsSimulate( void )
ctx->cmd.buttons &= ~(IN_ATTACK | IN_JUMP | IN_SPEED |
IN_ALT1 | IN_ALT2 | IN_BACK | IN_FORWARD | IN_MOVELEFT | IN_MOVERIGHT | IN_RUN);
const bool isTachi = (dynamic_cast<CWeaponTachi*>(GetActiveWeapon()) != NULL);
if (!isTachi)
const bool isSupa7 = (dynamic_cast<CWeaponSupa7*>(GetActiveWeapon()) != NULL);
// with the experimental reloads, the Supa-7's freeze-time alt-fire picks slugs for the load
if (!isTachi && !(isSupa7 && NEORules()->IsReloadExperimental()))
{
ctx->cmd.buttons &= ~IN_ATTACK2;
}
Expand Down
1 change: 1 addition & 0 deletions src/game/server/neo/neo_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ CNEO_Player::CNEO_Player()
} convars[] = {
{ "cl_neo_pvs_cull_roaming_observer", "0" },
{ "cl_neo_streamermode", "0" },
{ "cl_neo_supa7_prefer_slugs", "0" },
{ "cl_neo_tachi_prefer_auto", "1" },
{ "cl_neo_taking_damage_sounds", "0" },
{ "cl_onlysteamnick", "0" },
Expand Down
5 changes: 4 additions & 1 deletion src/game/server/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
#include "../../common/neo/bit_cast.h"
#include "neo_player.h"
#include "weapon_tachi.h"
#include "weapon_supa7.h"
#include "neo_gamerules.h"
#include "tier1/convar_serverbounded.h"
#endif
Expand Down Expand Up @@ -4019,7 +4020,9 @@ void CBasePlayer::PlayerRunCommand(CUserCmd *ucmd, IMoveHelper *moveHelper)
ucmd->buttons &= ~(IN_ATTACK | IN_JUMP | IN_SPEED |
IN_ALT1 | IN_ALT2 | IN_BACK | IN_FORWARD | IN_MOVELEFT | IN_MOVERIGHT | IN_RUN);
const bool isTachi = (dynamic_cast<CWeaponTachi*>(GetActiveWeapon()) != NULL);
if (!isTachi)
const bool isSupa7 = (dynamic_cast<CWeaponSupa7*>(GetActiveWeapon()) != NULL);
// with the experimental reloads, the Supa-7's freeze-time alt-fire picks slugs for the load
if (!isTachi && !(isSupa7 && NEORules()->IsReloadExperimental()))
{
ucmd->buttons &= ~IN_ATTACK2;
}
Expand Down
Loading
Loading