From 4a66ba62671db54413b3fae6365d2f9c65e9ee42 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 29 Dec 2005 19:38:58 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/RageDisplay.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index 826c3e2846..965ab6c6bd 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -550,20 +550,19 @@ RageSurface *RageDisplay::CreateSurfaceFromPixfmt( PixelFormat pixfmt,
 	return surf;
 }
 
-PixelFormat RageDisplay::FindPixelFormat( 
-	int bpp, int Rmask, int Gmask, int Bmask, int Amask, bool realtime )
+PixelFormat RageDisplay::FindPixelFormat( int iBPP, int iRmask, int iGmask, int iBmask, int iAmask, bool bRealtime )
 {
-	PixelFormatDesc tmp = { bpp, { Rmask, Gmask, Bmask, Amask } };
+	PixelFormatDesc tmp = { iBPP, { iRmask, iGmask, iBmask, iAmask } };
 
-	for(int pixfmt = 0; pixfmt < NUM_PixelFormat; ++pixfmt)
+	FOREACH_ENUM2( PixelFormat, iPixFmt )
 	{
-		const PixelFormatDesc *pf = GetPixelFormatDesc(PixelFormat(pixfmt));
-		if(!SupportsTextureFormat( PixelFormat(pixfmt), realtime ))
+		const PixelFormatDesc *pf = GetPixelFormatDesc( PixelFormat(iPixFmt) );
+		if( !SupportsTextureFormat(PixelFormat(iPixFmt), bRealtime) )
 			continue;
 
-		if(memcmp(pf, &tmp, sizeof(tmp)))
+		if( memcmp(pf, &tmp, sizeof(tmp)) )
 			continue;
-		return PixelFormat(pixfmt);
+		return iPixFmt;
 	}
 
 	return PixelFormat_INVALID;