various changes from sm4 and sm-ssc (svn); see updated changelog for the full information

This commit is contained in:
AJ Kelly
2010-02-18 23:17:24 -06:00
parent f9bfc80fa9
commit 5c5ef54a48
26 changed files with 436 additions and 260 deletions
+1 -2
View File
@@ -19,7 +19,6 @@ static void GetResolutionFromFileName( RString sPath, int &iWidth, int &iHeight
* Foo (res 512x128).png
* Also allow, eg:
* Foo (dither, res 512x128).png
*
* Be careful that this doesn't get mixed up with frame dimensions. */
static Regex re( "\\([^\\)]*res ([0-9]+)x([0-9]+).*\\)" );
@@ -202,7 +201,7 @@ void RageBitmapTexture::Create()
case 1:
pixfmt = PixelFormat_RGB5A1;
break;
default:
default:
pixfmt = PixelFormat_RGBA4;
break;
}