From f56bb35301836e56582a575a75864392a0177875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Mon, 2 Dec 2013 19:31:46 -0800 Subject: Fix line endings. WHAMMY. --- mp/src/utils/vbsp/materialsub.cpp | 178 +++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 89 deletions(-) (limited to 'mp/src/utils/vbsp/materialsub.cpp') diff --git a/mp/src/utils/vbsp/materialsub.cpp b/mp/src/utils/vbsp/materialsub.cpp index d8eb40df..b02063ef 100644 --- a/mp/src/utils/vbsp/materialsub.cpp +++ b/mp/src/utils/vbsp/materialsub.cpp @@ -1,90 +1,90 @@ -//========= Copyright Valve Corporation, All rights reserved. ============// -// -// Purpose: This file loads a KeyValues file containing material name mappings. -// When the bsp is compiled, all materials listed in the file will -// be replaced by the second material in the pair. -// -//============================================================================= - -#include "vbsp.h" -#include "materialsub.h" -#include "KeyValues.h" -#include "tier1/strtools.h" - -bool g_ReplaceMaterials = false; - -static KeyValues *kv = 0; -static KeyValues *allMapKeys = 0; -static KeyValues *curMapKeys = 0; - -//----------------------------------------------------------------------------- -// Purpose: Loads the KeyValues file for materials replacements -//----------------------------------------------------------------------------- -void LoadMaterialReplacementKeys( const char *gamedir, const char *mapname ) -{ - // Careful with static variables - if( kv ) - { - kv->deleteThis(); - kv = 0; - } - if( allMapKeys ) - allMapKeys = 0; - if( curMapKeys ) - curMapKeys = 0; - - Msg( "Loading Replacement Keys\n" ); - - // Attach the path to the keyValues file - char path[1024]; - Q_snprintf( path, sizeof( path ), "%scfg\\materialsub.cfg", gamedir ); - - // Load the keyvalues file - kv = new KeyValues( "MaterialReplacements" ); - - Msg( "File path: %s", path ); - if( !kv->LoadFromFile( g_pFileSystem, path ) ) - { - Msg( "Failed to load KeyValues file!\n" ); - g_ReplaceMaterials = false; - kv->deleteThis(); - kv = 0; - return; - } - - // Load global replace keys - allMapKeys = kv->FindKey( "AllMaps", true ); - - // Load keys for the current map - curMapKeys = kv->FindKey( mapname ); - - allMapKeys->ChainKeyValue( curMapKeys ); -} - -//----------------------------------------------------------------------------- -// Purpose: Deletes all keys -//----------------------------------------------------------------------------- -void DeleteMaterialReplacementKeys( void ) -{ - if( kv ) - { - kv->deleteThis(); - kv = 0; - } -} - -//----------------------------------------------------------------------------- -// Purpose: Replace the passed-in material name with a replacement name, if one exists -//----------------------------------------------------------------------------- -const char* ReplaceMaterialName( const char *name ) -{ - // Look for the material name in the global and map KeyValues - // If it's not there, just return the original name - - // HACK: This stinks - KeyValues won't take a string with '/' in it. - // If they did, this could be a simple pointer swap. - char newName[1024]; - Q_strncpy( newName, name, sizeof( newName ) ); - Q_FixSlashes( newName ); - return allMapKeys->GetString( newName, name ); +//========= Copyright Valve Corporation, All rights reserved. ============// +// +// Purpose: This file loads a KeyValues file containing material name mappings. +// When the bsp is compiled, all materials listed in the file will +// be replaced by the second material in the pair. +// +//============================================================================= + +#include "vbsp.h" +#include "materialsub.h" +#include "KeyValues.h" +#include "tier1/strtools.h" + +bool g_ReplaceMaterials = false; + +static KeyValues *kv = 0; +static KeyValues *allMapKeys = 0; +static KeyValues *curMapKeys = 0; + +//----------------------------------------------------------------------------- +// Purpose: Loads the KeyValues file for materials replacements +//----------------------------------------------------------------------------- +void LoadMaterialReplacementKeys( const char *gamedir, const char *mapname ) +{ + // Careful with static variables + if( kv ) + { + kv->deleteThis(); + kv = 0; + } + if( allMapKeys ) + allMapKeys = 0; + if( curMapKeys ) + curMapKeys = 0; + + Msg( "Loading Replacement Keys\n" ); + + // Attach the path to the keyValues file + char path[1024]; + Q_snprintf( path, sizeof( path ), "%scfg\\materialsub.cfg", gamedir ); + + // Load the keyvalues file + kv = new KeyValues( "MaterialReplacements" ); + + Msg( "File path: %s", path ); + if( !kv->LoadFromFile( g_pFileSystem, path ) ) + { + Msg( "Failed to load KeyValues file!\n" ); + g_ReplaceMaterials = false; + kv->deleteThis(); + kv = 0; + return; + } + + // Load global replace keys + allMapKeys = kv->FindKey( "AllMaps", true ); + + // Load keys for the current map + curMapKeys = kv->FindKey( mapname ); + + allMapKeys->ChainKeyValue( curMapKeys ); +} + +//----------------------------------------------------------------------------- +// Purpose: Deletes all keys +//----------------------------------------------------------------------------- +void DeleteMaterialReplacementKeys( void ) +{ + if( kv ) + { + kv->deleteThis(); + kv = 0; + } +} + +//----------------------------------------------------------------------------- +// Purpose: Replace the passed-in material name with a replacement name, if one exists +//----------------------------------------------------------------------------- +const char* ReplaceMaterialName( const char *name ) +{ + // Look for the material name in the global and map KeyValues + // If it's not there, just return the original name + + // HACK: This stinks - KeyValues won't take a string with '/' in it. + // If they did, this could be a simple pointer swap. + char newName[1024]; + Q_strncpy( newName, name, sizeof( newName ) ); + Q_FixSlashes( newName ); + return allMapKeys->GetString( newName, name ); } \ No newline at end of file -- cgit v1.2.3