Skip to content

remove the cheat flag from marine backpacks #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 3 commits into from
Aug 1, 2025
+4 −4
Merged

remove the cheat flag from marine backpacks #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bdfe44
remove the cheat flag from marine backpacks
mithrand0 Jul 21, 2025
494719e
implement the following logic for rd_client_marine_backpacks:
mithrand0 Jul 28, 2025
b2da747
fix description
mithrand0 Jul 28, 2025
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
6 changes: 3 additions & 3 deletions src/game/client/swarm/c_asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ ConVar rd_marine_explodes_into_gibs("rd_marine_explodes_into_gibs", "1", FCVAR_A
ConVar rd_marine_gib_lifetime( "rd_marine_gib_lifetime", "36000.0", FCVAR_NONE, "number of seconds before marine gibs fade" );
ConVar rd_marine_gib_lifetime_dm( "rd_marine_gib_lifetime_dm", "15.0", FCVAR_NONE, "number of seconds before marine gibs fade in deathmatch mode" );
ConVar rd_marine_gib_spin( "rd_marine_gib_spin", "500", FCVAR_NONE, "how much do marine gibs spin?" );
ConVar rd_client_marine_backpacks( "rd_client_marine_backpacks", "0", FCVAR_NONE, "Show marine's un-equipped weapon on their back." );
ConVar rd_server_marine_backpacks( "rd_server_marine_backpacks", "0", FCVAR_REPLICATED | FCVAR_CHEAT, "Attach unactive weapon model to marine's back" );
ConVar rd_client_marine_backpacks( "rd_client_marine_backpacks", "-1", FCVAR_NONE, "Show marine's un-equipped weapon on their back (0 = disabled, 1 = enabled, -1 = let the server pick)" );
ConVar rd_server_marine_backpacks( "rd_server_marine_backpacks", "0", FCVAR_REPLICATED, "Attach unactive weapon model to marine's back" );
ConVar rd_projected_texture_min_z( "rd_projected_texture_min_z", "-64", FCVAR_REPLICATED | FCVAR_CHEAT, "Projected textures that do not reach at least as high as this distance from the current marine's feet are considered non-visible." );

extern ConVar asw_DebugAutoAim;
Expand Down Expand Up @@ -2450,7 +2450,7 @@ void C_ASW_Marine::CreateShoulderCone()

void C_ASW_Marine::CreateBackpack( C_ASW_Weapon *pWeapon )
{
if ( !rd_client_marine_backpacks.GetBool() && !rd_server_marine_backpacks.GetBool() )
if ( rd_client_marine_backpacks.GetInt() == 0 || (rd_client_marine_backpacks.GetInt() == -1 && !rd_server_marine_backpacks.GetBool()) )
{
RemoveBackpack();
return;
Expand Down
2 changes: 1 addition & 1 deletion src/game/server/swarm/asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extern ConVar rd_burning_interval;
extern ConVar rd_burning_marine_damage;
ConVar rd_marine_ff_fist_scale( "rd_marine_ff_fist_scale", "1", FCVAR_CHEAT, "Scale CLUB type damage done to marines (requires rd_ff_marine_fist)" );

ConVar rd_server_marine_backpacks("rd_server_marine_backpacks", "0", FCVAR_REPLICATED | FCVAR_CHEAT, "Attach unactive weapon model to marine's back");
ConVar rd_server_marine_backpacks("rd_server_marine_backpacks", "0", FCVAR_REPLICATED, "Attach unactive weapon model to marine's back");

ConVar rda_marine_strafe_allow_air("rda_marine_strafe_allow_air", "0", FCVAR_CHEAT, "If set to 1 marine able to strafe jump once in the air");
ConVar rda_marine_strafe_push_hor_velocity("rda_marine_strafe_push_hor_velocity", "520", FCVAR_CHEAT, "Horizontal velocity for strafe push");
Expand Down