From 4e5219ceddcdbccd74b6e2294b48dfe5bf940ae3 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 15 Jan 2007 23:47:55 +0000
Subject: [PATCH] SubType_INVALID -> SubType_Invalid

---
 stepmania/src/NoteDataUtil.cpp        |  2 +-
 stepmania/src/NoteDataWithScoring.cpp |  2 +-
 stepmania/src/NoteTypes.cpp           | 16 ++++++++--------
 stepmania/src/NoteTypes.h             |  4 ++--
 stepmania/src/Player.cpp              |  4 ++--
 stepmania/src/ScreenEdit.cpp          |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 139800dec6..bc520ea11c 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -1952,7 +1952,7 @@ void NoteDataUtil::AddTapAttacks( NoteData &nd, Song* pSong )
 		int iTrack = iBeat % nd.GetNumTracks();	// deterministically calculates track
 		TapNote tn(
 			TapNote::attack,
-			TapNote::SubType_INVALID,
+			TapNote::SubType_Invalid,
 			TapNote::original, 
 			szAttacks[RandomInt(ARRAYLEN(szAttacks))],
 			15.0f, 
diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index d99019b245..396bb485c8 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -39,7 +39,7 @@ int GetNumNWithScore( const NoteData &in, TapNoteScore tns, int MinTaps, int iSt
 
 int GetNumHoldNotesWithScore( const NoteData &in, TapNote::SubType subType, HoldNoteScore hns )
 {
-	ASSERT( subType != TapNote::SubType_INVALID );
+	ASSERT( subType != TapNote::SubType_Invalid );
 
 	int iNumSuccessfulHolds = 0;
 	for( int t=0; t<in.GetNumTracks(); ++t )
diff --git a/stepmania/src/NoteTypes.cpp b/stepmania/src/NoteTypes.cpp
index ca8ee26932..33c7c6bd07 100644
--- a/stepmania/src/NoteTypes.cpp
+++ b/stepmania/src/NoteTypes.cpp
@@ -5,16 +5,16 @@
 #include "XmlFile.h"
 #include "LocalizedString.h"
 
-TapNote TAP_EMPTY			( TapNote::empty,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_TAP		( TapNote::tap,		TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_LIFT		( TapNote::lift,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
+TapNote TAP_EMPTY			( TapNote::empty,	TapNote::SubType_Invalid,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_TAP		( TapNote::tap,		TapNote::SubType_Invalid,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_LIFT		( TapNote::lift,	TapNote::SubType_Invalid,	TapNote::original, "", 0, -1 );
 TapNote TAP_ORIGINAL_HOLD_HEAD		( TapNote::hold_head,	TapNote::hold_head_hold,	TapNote::original, "", 0, -1 );
 TapNote TAP_ORIGINAL_ROLL_HEAD		( TapNote::hold_head,	TapNote::hold_head_roll,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_MINE		( TapNote::mine,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_ATTACK		( TapNote::attack,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_AUTO_KEYSOUND	( TapNote::autoKeysound,TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
-TapNote TAP_ADDITION_TAP		( TapNote::tap,		TapNote::SubType_INVALID,	TapNote::addition, "", 0, -1 );
-TapNote TAP_ADDITION_MINE		( TapNote::mine,	TapNote::SubType_INVALID,	TapNote::addition, "", 0, -1 );
+TapNote TAP_ORIGINAL_MINE		( TapNote::mine,	TapNote::SubType_Invalid,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_ATTACK		( TapNote::attack,	TapNote::SubType_Invalid,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_AUTO_KEYSOUND	( TapNote::autoKeysound,TapNote::SubType_Invalid,	TapNote::original, "", 0, -1 );
+TapNote TAP_ADDITION_TAP		( TapNote::tap,		TapNote::SubType_Invalid,	TapNote::addition, "", 0, -1 );
+TapNote TAP_ADDITION_MINE		( TapNote::mine,	TapNote::SubType_Invalid,	TapNote::addition, "", 0, -1 );
 
 static const char *NoteTypeNames[] = {
 	"4th",
diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h
index 3686429c21..b411def7eb 100644
--- a/stepmania/src/NoteTypes.h
+++ b/stepmania/src/NoteTypes.h
@@ -72,7 +72,7 @@ struct TapNote
 		hold_head_hold,
 		hold_head_roll,
 		NUM_SubType,
-		SubType_INVALID
+		SubType_Invalid
 	};
 	enum Source
 	{
@@ -102,7 +102,7 @@ struct TapNote
 	XNode* CreateNode() const;
 	void LoadFromNode( const XNode* pNode );
 
-	TapNote() : type(empty), subType(SubType_INVALID), source(original), pn(PLAYER_INVALID), bHopoPossible(false),
+	TapNote() : type(empty), subType(SubType_Invalid), source(original), pn(PLAYER_INVALID), bHopoPossible(false),
 		fAttackDurationSeconds(0.f), iKeysoundIndex(-1), iDuration(0)  { }
 	TapNote( 
 		Type type_,
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index d4d03741ed..fddfb016f4 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -750,14 +750,14 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
 	int iMaxEndRow = INT_MIN;
 	int iFirstTrackWithMaxEndRow = -1;
 
-	TapNote::SubType subType = TapNote::SubType_INVALID;
+	TapNote::SubType subType = TapNote::SubType_Invalid;
 	FOREACH( TrackRowTapNote, vTN, trtn )
 	{
 		int iTrack = trtn->iTrack;
 		ASSERT( iStartRow == trtn->iRow );
 		TapNote &tn = *trtn->pTN;
 		int iEndRow = iStartRow + tn.iDuration;
-		if( subType == TapNote::SubType_INVALID )
+		if( subType == TapNote::SubType_Invalid )
 			subType = tn.subType;
 		
 		/* All holds must be of the same subType because fLife is handled 
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index a2629db69d..6c51088d23 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2487,7 +2487,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 		
 		TapNote tn(
 			TapNote::attack, 
-			TapNote::SubType_INVALID,
+			TapNote::SubType_Invalid,
 			TapNote::original, 
 			sMods,
 			g_fLastInsertAttackDurationSeconds,