From 4a5280f71d178353e57de128e48afab38ee3384e Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 7 Jun 2003 10:36:39 +0000
Subject: [PATCH] force D3D for Savage cards (until we figure what the error in
 glTex2D is)

---
 .../Data/{VideoCards.ini => VideoCardDefaults.ini} | 14 ++++++++++----
 stepmania/src/StepMania.cpp                        | 13 +++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)
 rename stepmania/Data/{VideoCards.ini => VideoCardDefaults.ini} (80%)

diff --git a/stepmania/Data/VideoCards.ini b/stepmania/Data/VideoCardDefaults.ini
similarity index 80%
rename from stepmania/Data/VideoCards.ini
rename to stepmania/Data/VideoCardDefaults.ini
index e072e0710f..aabc78f1a8 100644
--- a/stepmania/Data/VideoCards.ini
+++ b/stepmania/Data/VideoCardDefaults.ini
@@ -1,6 +1,3 @@
-[VideoCards]
-NumEntries=4
-
 [0000]
 DriverRegex=Voodoo3|3dfx
 Renderers=d3d
@@ -28,9 +25,18 @@ DisplayColor=16
 TextureColor=16
 AntiAliasing=0	
 
+[0003]
+DriverRegex=Savage
+Renderers=d3d	// OpenGL has problems loading textures.  I'll investigate when my Savage card comes. -Chris
+Width=640
+Height=480
+DisplayColor=16
+TextureColor=16
+AntiAliasing=0	
+
 // Default graphics settings used for all cards that don't match above.
 // This must be the very last entry!
-[0003]
+[0004]
 DriverRegex=
 Renderers=opengl,d3d
 Width=640
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 3cacfbb0cd..8a181d224c 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -260,20 +260,17 @@ RageDisplay *CreateDisplay()
 	{
 		// Apply default graphic settings for this card
 		IniFile ini;
-		ini.SetPath( "Data/VideoCards.ini" );
+		ini.SetPath( "Data/VideoCardDefaults.ini" );
 		if(!ini.ReadFile())
-			RageException::Throw( "Couldn't read VideoCards.ini." );
+			RageException::Throw( "Couldn't read Data/VideoCardDefaults.ini." );
 
-		int iNumEntries = 0;
-		if(!ini.GetValueI( "VideoCards", "NumEntries", iNumEntries ))
-			RageException::Throw( "Couldn't read NumEntries in VideoCards.ini." );
-
-		for( int i=0; i<iNumEntries; i++ )
+		for( int i=0; true; i++ )
 		{
 			CString sKey = ssprintf("%04d",i);
 
 			CString sDriverRegex;
-			ini.GetValue( sKey, "DriverRegex", sDriverRegex );
+			if( !ini.GetValue( sKey, "DriverRegex", sDriverRegex ) )
+				break;
 			Regex regex( sDriverRegex );
 			if( !regex.Compare(sVideoDriver) )
 				continue;	// skip