Skip to content

Start using Mapbase default player and hand model values #327

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
1upD merged 1 commit into from
Feb 3, 2025
Merged

Start using Mapbase default player and hand model values #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions sp/src/game/server/ez2/ez2_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,6 @@ void CEZ2_Player::Spawn( void )

BaseClass::Spawn();

SetModel( "models/bad_cop.mdl" );

Activate();

if (GetBonusChallenge() != EZ_CHALLENGE_NONE)
Expand Down
9 changes: 9 additions & 0 deletions sp/src/game/shared/mapbase/mapbase_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,19 @@ class CMapbaseSystem : public CAutoGameSystem
}

#ifdef GAME_DLL
#ifdef EZ2
Q_strncpy( g_szDefaultPlayerModel, gameinfo->GetString( "player_default_model", "models/bad_cop.mdl" ), sizeof( g_szDefaultPlayerModel ) );
#else
Q_strncpy( g_szDefaultPlayerModel, gameinfo->GetString( "player_default_model", "models/player.mdl" ), sizeof( g_szDefaultPlayerModel ) );
#endif
g_bDefaultPlayerDrawExternally = gameinfo->GetBool( "player_default_draw_externally", false );

#ifdef EZ2
extern ConVar sv_player_hands_modelname;
Q_strncpy( g_szDefaultHandsModel, gameinfo->GetString( "player_default_hands", sv_player_hands_modelname.GetString() ), sizeof( g_szDefaultHandsModel ) );
#else
Q_strncpy( g_szDefaultHandsModel, gameinfo->GetString( "player_default_hands", "models/weapons/v_hands.mdl" ), sizeof( g_szDefaultHandsModel ) );
#endif
g_iDefaultHandsSkin = gameinfo->GetInt( "player_default_hands_skin", 0 );
g_iDefaultHandsBody = gameinfo->GetInt( "player_default_hands_body", 0 );
#endif
Expand Down