From 055dc00f5060e2b430185f83e15ee358191af8e4 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 5 Jun 2005 03:24:30 +0000
Subject: [PATCH] #BGCHANGES1 -> #BGCHANGES2

---
 stepmania/src/NotesLoaderSM.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index 16fd7430f1..484b351b9f 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -336,10 +336,11 @@ bool SMLoader::LoadFromSMFile( CString sPath, Song &out )
 		else if( sValueName=="BGCHANGES" || sValueName=="ANIMATIONS" )
 		{
 			BackgroundLayer iLayer = BACKGROUND_LAYER_1;
-			sscanf( sValueName, "BGCHANGES%d", &iLayer );
-			iLayer = (BackgroundLayer)(iLayer-1);
+			if( 1 == sscanf( sValueName, "BGCHANGES%d", &iLayer ) )
+				iLayer = (BackgroundLayer)(iLayer-1);	// #BGCHANGES2 = BACKGROUND_LAYER_2
 
-			if( iLayer < 0 && iLayer >= NUM_BackgroundLayer )
+			bool bValid = iLayer>=0 && iLayer<NUM_BackgroundLayer;
+			if( !bValid )
 			{
 				LOG->Warn( "The song file '%s' has a BGCHANGES tag '%s' that is out of range.", sPath.c_str(), sValueName.c_str() );
 			}