From 3c6f768fd7a77af7972747a7af86e526cfa17611 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 5 May 2003 06:21:01 +0000 Subject: [PATCH] use parens instead of brackets --- stepmania/src/RageBitmapTexture.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp index 39ba1db2d1..049632060a 100644 --- a/stepmania/src/RageBitmapTexture.cpp +++ b/stepmania/src/RageBitmapTexture.cpp @@ -108,11 +108,12 @@ int PixFmtMaskNo(GLenum fmt) static void GetResolutionFromFileName( CString sPath, int &Width, int &Height ) { /* Match: - * Foo [res 512x128].png - * - * This leaves us room syntactically to do other things later, if we need to. + * Foo (res 512x128).png + * Also allow, eg: + * Foo (dither, res 512x128).png + * * Be careful that this doesn't get mixed up with frame dimensions. */ - Regex re("\\[res ([0-9]+)x([0-9]+)\\]"); + Regex re("\\([^\\)]*res ([0-9]+)x([0-9]+).*\\)"); vector matches; if(!re.Compare(sPath, matches))