Fixed #9459 (Increase default-set max streaming memory)

multitheftauto · Nov 17, 2016 · 1b9161f · 1b9161f
1 parent 0970453
commit 1b9161f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Client/core/CClientVariables.cpp b/Client/core/CClientVariables.cpp
@@ -342,7 +342,7 @@ void CClientVariables::LoadDefaults ( void )
         Set ( "display_resolution", SString ( "%dx%dx32", rect.right, rect.bottom ) );
     }
 
-    // We will default this one at CClientGame.cpp, because we need a valid direct3d device to give a proper default value.
+    // We will default this one during CProxyDirect3DDevice9 constructor, because we need a valid direct3d device to give a proper default value.
 #if 0
     DEFAULT ( "streaming_memory",           50 );                           // Streaming memory
 #endif

diff --git a/Client/core/DXHook/CProxyDirect3DDevice9.cpp b/Client/core/DXHook/CProxyDirect3DDevice9.cpp
@@ -83,6 +83,10 @@ CProxyDirect3DDevice9::CProxyDirect3DDevice9 ( IDirect3DDevice9 * pDevice  )
                             , g_pDeviceState->AdapterState.MaxAnisotropicSetting
                             ) );
 
+    // Give a default value for the streaming memory setting
+    if ( g_pCore->GetCVars()->Exists( "streaming_memory" ) == false )
+        g_pCore->GetCVars()->Set( "streaming_memory", g_pCore->GetMaxStreamingMemory() );
+
     // Call event handler
     CDirect3DEvents9::OnDirect3DDeviceCreate ( pDevice );
 }

diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -345,10 +345,6 @@ CClientGame::CClientGame ( bool bLocalPlay )
 
     // Reset test mode script settings to default
     g_pCore->GetGraphics ()->GetRenderItemManager ()->SetTestMode ( DX_TEST_MODE_NONE );
-
-    // Give a default value for the streaming memory
-    if ( g_pCore->GetCVars()->Exists ( "streaming_memory" ) == false )
-        g_pCore->GetCVars()->Set ( "streaming_memory", g_pCore->GetMaxStreamingMemory () );
 }