MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-27 07:15:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Divided mapbase_version cvar into server, client, and game_shader_dx9 counterparts

Browse Source
This commit is contained in:
Blixibon 2021-06-28 20:04:23 -05:00
parent 7d2970eacd
commit 5f42182c45
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sp/src/game/shared/mapbase/mapbase_shared.cpp
View File

@ -55,11 +55,9 @@ ConVar mapbase_load_soundscripts("mapbase_load_soundscripts", "1", FCVAR_ARCHIVE
ConVar mapbase_load_localization("mapbase_load_localization", "1", FCVAR_ARCHIVE, "Should we load map-specific localized text files? e.g. \"maps/mapname_english.txt\""); ConVar mapbase_load_localization("mapbase_load_localization", "1", FCVAR_ARCHIVE, "Should we load map-specific localized text files? e.g. \"maps/mapname_english.txt\"");
#ifdef CLIENT_DLL #ifdef GAME_DLL
// This constant should change with each Mapbase update
//ConVar mapbase_load_cc("mapbase_load_cc", "1", FCVAR_ARCHIVE, "Should we load map-specific closed captioning? e.g. \"maps/mapname_closecaption_english.txt\" and \"maps/mapname_closecaption_english.dat\""); ConVar mapbase_version( "mapbase_version", MAPBASE_VERSION, FCVAR_NONE, "The version of Mapbase currently being used in this mod's server.dll" );
#else
ConVar mapbase_load_sentences("mapbase_load_sentences", "1", FCVAR_ARCHIVE, "Should we load map-specific sentences? e.g. \"maps/mapname_sentences.txt\""); ConVar mapbase_load_sentences("mapbase_load_sentences", "1", FCVAR_ARCHIVE, "Should we load map-specific sentences? e.g. \"maps/mapname_sentences.txt\"");
@ -68,12 +66,6 @@ ConVar mapbase_flush_talker("mapbase_flush_talker", "1", FCVAR_NONE, "Normally,
ConVar mapbase_load_actbusy("mapbase_load_actbusy", "1", FCVAR_ARCHIVE, "Should we load map-specific actbusy files? e.g. \"maps/mapname_actbusy.txt\""); ConVar mapbase_load_actbusy("mapbase_load_actbusy", "1", FCVAR_ARCHIVE, "Should we load map-specific actbusy files? e.g. \"maps/mapname_actbusy.txt\"");
#endif
#ifdef GAME_DLL
// This cvar should change with each Mapbase update
ConVar mapbase_version( "mapbase_version", "7.0", FCVAR_NONE, "The version of Mapbase currently being used in this mod." );
extern void MapbaseGameLog_Init(); extern void MapbaseGameLog_Init();
extern void ParseCustomActbusyFile(const char *file); extern void ParseCustomActbusyFile(const char *file);
@ -83,6 +75,12 @@ extern void ReloadResponseSystem();
// Reloads the response system when the map changes to avoid custom talker leaking // Reloads the response system when the map changes to avoid custom talker leaking
static bool g_bMapContainsCustomTalker; static bool g_bMapContainsCustomTalker;
#else
// This constant should change with each Mapbase update
ConVar mapbase_version_client( "mapbase_version_client", MAPBASE_VERSION, FCVAR_NONE, "The version of Mapbase currently being used in this mod's client.dll" );
//ConVar mapbase_load_cc("mapbase_load_cc", "1", FCVAR_ARCHIVE, "Should we load map-specific closed captioning? e.g. \"maps/mapname_closecaption_english.txt\" and \"maps/mapname_closecaption_english.dat\"");
#endif #endif
// Indicates this is a core Mapbase mod and not a mod using its code. // Indicates this is a core Mapbase mod and not a mod using its code.

3
sp/src/materialsystem/stdshaders/BaseVSShader.cpp
View File

@ -55,6 +55,9 @@ static ConVar mat_fullbright( "mat_fullbright","0", FCVAR_CHEAT );
ConVar r_flashlightbrightness( "r_flashlightbrightness", "0.25", FCVAR_CHEAT ); ConVar r_flashlightbrightness( "r_flashlightbrightness", "0.25", FCVAR_CHEAT );
#ifdef MAPBASE #ifdef MAPBASE
// This constant should change with each Mapbase update
ConVar mapbase_version_shaders( "mapbase_version_shaders", MAPBASE_VERSION, FCVAR_NONE, "The version of Mapbase currently being used in this mod's game_shader_dx9.dll" );
ConVar mat_specular_disable_on_missing( "mat_specular_disable_on_missing", "1", FCVAR_ARCHIVE, "Disables specular reflections on a material when the envmap cannot be found." ); ConVar mat_specular_disable_on_missing( "mat_specular_disable_on_missing", "1", FCVAR_ARCHIVE, "Disables specular reflections on a material when the envmap cannot be found." );
#endif #endif

8
sp/src/public/tier0/platform.h
View File

@ -1234,6 +1234,14 @@ inline bool Plat_IsInDebugSession( bool bForceRecheck = false ) { return false;
PLATFORM_INTERFACE bool Is64BitOS(); PLATFORM_INTERFACE bool Is64BitOS();
#ifdef MAPBASE
//-----------------------------------------------------------------------------
// General Mapbase version constant compiled into projects for versioning purposes
//-----------------------------------------------------------------------------
#define MAPBASE_VERSION "7.0"
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// XBOX Components valid in PC compilation space // XBOX Components valid in PC compilation space
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------