From 9758932be06e5c3a56d14bd585c833d2d0f939dd Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Sun, 26 Apr 2015 09:23:12 -0600 Subject: [PATCH] Changed RageBitmapTexture to pass a dialog id for the missing texture warning so it can be ignored. Updated changelog. --- Docs/Changelog_sm5.txt | 9 +++++++++ src/RageBitmapTexture.cpp | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 009f6814ba..89e199f21f 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -4,6 +4,15 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt. ________________________________________________________________________________ +2015/04/25 +---------- +* [General] Screenshot key now checks whether there is a current song, and + puts the song title and current screen name in the screenshot filename. [kyzentun] + +2015/04/24 +---------- +* [Gameplay] Toasty animation can now occur multiple times during gameplay. [kyzentun] + 2015/04/23 ---------- * [ServiceMenu] Entries in service menu rearranged to hopefully organize them diff --git a/src/RageBitmapTexture.cpp b/src/RageBitmapTexture.cpp index 2652676f0b..4a8af5343f 100644 --- a/src/RageBitmapTexture.cpp +++ b/src/RageBitmapTexture.cpp @@ -85,8 +85,10 @@ void RageBitmapTexture::Create() /* Tolerate corrupt/unknown images. */ if( pImg == NULL ) { - RString sWarning = ssprintf( "RageBitmapTexture: Couldn't load %s: %s", actualID.filename.c_str(), error.c_str() ); - Dialog::OK( sWarning ); + RString warning = ssprintf("RageBitmapTexture: Couldn't load %s: %s", + actualID.filename.c_str(), error.c_str()); + LOG->Warn(warning); + Dialog::OK(warning, "missing_texture"); pImg = RageSurfaceUtils::MakeDummySurface( 64, 64 ); ASSERT( pImg != NULL ); }