From c88f3d38861f62093e8fe4a87dd19e0e11576f93 Mon Sep 17 00:00:00 2001 From: "ALLEN-PC\\acj30" Date: Fri, 31 Jan 2025 09:28:42 -0600 Subject: [PATCH] Start using Mapbase default player and hand model values --- sp/src/game/server/ez2/ez2_player.cpp | 2 -- sp/src/game/shared/mapbase/mapbase_shared.cpp | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sp/src/game/server/ez2/ez2_player.cpp b/sp/src/game/server/ez2/ez2_player.cpp index 9a965b025fb..a3066c5e7cd 100644 --- a/sp/src/game/server/ez2/ez2_player.cpp +++ b/sp/src/game/server/ez2/ez2_player.cpp @@ -514,8 +514,6 @@ void CEZ2_Player::Spawn( void ) BaseClass::Spawn(); - SetModel( "models/bad_cop.mdl" ); - Activate(); if (GetBonusChallenge() != EZ_CHALLENGE_NONE) diff --git a/sp/src/game/shared/mapbase/mapbase_shared.cpp b/sp/src/game/shared/mapbase/mapbase_shared.cpp index 500c5e2c394..ba0ff5dfb7b 100644 --- a/sp/src/game/shared/mapbase/mapbase_shared.cpp +++ b/sp/src/game/shared/mapbase/mapbase_shared.cpp @@ -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