diff --git a/neo/framework/Common.cpp b/neo/framework/Common.cpp index ee3bba9a..acea555c 100644 --- a/neo/framework/Common.cpp +++ b/neo/framework/Common.cpp @@ -1457,23 +1457,10 @@ void Com_ExecMachineSpec_f( const idCmdArgs &args ) { cvarSystem->SetCVarBool( "com_purgeAll", false, CVAR_ARCHIVE ); cvarSystem->SetCVarBool( "r_forceLoadImages", false, CVAR_ARCHIVE ); - bool oldCard = false; - bool nv10or20 = false; - renderSystem->GetCardCaps( oldCard, nv10or20 ); - if ( oldCard ) { - cvarSystem->SetCVarBool( "g_decals", false, CVAR_ARCHIVE ); - cvarSystem->SetCVarBool( "g_projectileLights", false, CVAR_ARCHIVE ); - cvarSystem->SetCVarBool( "g_doubleVision", false, CVAR_ARCHIVE ); - cvarSystem->SetCVarBool( "g_muzzleFlash", false, CVAR_ARCHIVE ); - } else { - cvarSystem->SetCVarBool( "g_decals", true, CVAR_ARCHIVE ); - cvarSystem->SetCVarBool( "g_projectileLights", true, CVAR_ARCHIVE ); - cvarSystem->SetCVarBool( "g_doubleVision", true, CVAR_ARCHIVE ); - cvarSystem->SetCVarBool( "g_muzzleFlash", true, CVAR_ARCHIVE ); - } - if ( nv10or20 ) { - cvarSystem->SetCVarInteger( "image_useNormalCompression", 1, CVAR_ARCHIVE ); - } + cvarSystem->SetCVarBool( "g_decals", true, CVAR_ARCHIVE ); + cvarSystem->SetCVarBool( "g_projectileLights", true, CVAR_ARCHIVE ); + cvarSystem->SetCVarBool( "g_doubleVision", true, CVAR_ARCHIVE ); + cvarSystem->SetCVarBool( "g_muzzleFlash", true, CVAR_ARCHIVE ); #if MACOS_X // On low settings, G4 systems & 64MB FX5200/NV34 Systems should default shadows off @@ -2697,17 +2684,13 @@ idCommonLocal::SetMachineSpec */ void idCommonLocal::SetMachineSpec( void ) { int sysRam = Sys_GetSystemRam(); - bool oldCard = false; - bool nv10or20 = false; - - renderSystem->GetCardCaps( oldCard, nv10or20 ); Printf( "Detected\n\t%i MB of System memory\n\n", sysRam ); - if ( sysRam >= 1024 && !oldCard ) { + if ( sysRam >= 1024 ) { Printf( "This system qualifies for Ultra quality!\n" ); com_machineSpec.SetInteger( 3 ); - } else if ( sysRam >= 512 && !oldCard ) { + } else if ( sysRam >= 512 ) { Printf( "This system qualifies for High quality!\n" ); com_machineSpec.SetInteger( 2 ); } else if ( sysRam >= 384 ) { diff --git a/neo/renderer/RenderSystem.h b/neo/renderer/RenderSystem.h index 3c777771..ef3a1835 100644 --- a/neo/renderer/RenderSystem.h +++ b/neo/renderer/RenderSystem.h @@ -243,7 +243,6 @@ public: // to use the default tga loading code without having dimmed down areas in many places virtual void CaptureRenderToFile( const char *fileName, bool fixAlpha = false ) = 0; virtual void UnCrop() = 0; - virtual void GetCardCaps( bool &oldCard, bool &nv10or20 ) = 0; // the image has to be already loaded ( most straightforward way would be through a FindMaterial ) // texture filter / mipmapping / repeat won't be modified by the upload diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index b82120bb..bfa8fd8c 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -2146,13 +2146,3 @@ idRenderSystemLocal::GetScreenHeight int idRenderSystemLocal::GetScreenHeight( void ) const { return glConfig.vidHeight; } - -/* -======================== -idRenderSystemLocal::GetCardCaps -======================== -*/ -void idRenderSystemLocal::GetCardCaps( bool &oldCard, bool &nv10or20 ) { - nv10or20 = false; - oldCard = false; -} diff --git a/neo/renderer/tr_local.h b/neo/renderer/tr_local.h index 2e0b42d2..51f105ff 100644 --- a/neo/renderer/tr_local.h +++ b/neo/renderer/tr_local.h @@ -727,7 +727,6 @@ public: virtual void CaptureRenderToImage( const char *imageName ); virtual void CaptureRenderToFile( const char *fileName, bool fixAlpha ); virtual void UnCrop(); - virtual void GetCardCaps( bool &oldCard, bool &nv10or20 ); virtual bool UploadImage( const char *imageName, const byte *data, int width, int height ); public: