From 9aaffa7b5af40600022ade5c9087ee707c539259 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 23 Aug 2002 21:57:42 +0000
Subject: [PATCH] change m_szName to m_szStyleName

---
 stepmania/src/GameManager.cpp | 4 ++--
 stepmania/src/StyleDef.h      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp
index ff5bc793d5..ae006dcef3 100644
--- a/stepmania/src/GameManager.cpp
+++ b/stepmania/src/GameManager.cpp
@@ -985,7 +985,7 @@ NotesType GameManager::StringToNotesType( CString sNotesType )
 {
 	sNotesType.MakeLower();
 	for( int i=0; i<NUM_STYLES; i++ )
-		if( g_StyleDefs[i].m_szName == sNotesType )
+		if( g_StyleDefs[i].m_szStyleName == sNotesType )
 			return g_StyleDefs[i].m_NotesType;
 	
 	// invalid NotesType
@@ -997,7 +997,7 @@ CString GameManager::NotesTypeToString( NotesType nt )
 {
 	for( int i=0; i<NUM_STYLES; i++ )
 		if( g_StyleDefs[i].m_NotesType == nt  )
-			return g_StyleDefs[i].m_szName ;
+			return g_StyleDefs[i].m_szStyleName ;
 
 	// invalid NotesType
 	ASSERT(0);
diff --git a/stepmania/src/StyleDef.h b/stepmania/src/StyleDef.h
index 9e9e3eb1ec..4bca3721f8 100644
--- a/stepmania/src/StyleDef.h
+++ b/stepmania/src/StyleDef.h
@@ -38,7 +38,7 @@ public:
 	Game		m_Game;				// Which Game is this Style used with?
 	bool		m_bUsedForGameplay;	// Can be used only for gameplay?
 	bool		m_bUsedForEdit;		// Can be used for editing?
-	char		m_szName[60];
+	char		m_szStyleName[60];
 	NotesType	m_NotesType;		// the notes format that this style reads.  
 									// For example, the "dance versus" reads the Notes with the tag "dance-single".
 	enum StyleType