Fixed unitialized radar in CalculateRadarValues. Changed song deletion message to use translated string. Updated changelog.

This commit is contained in:
Kyzentun
2015-03-27 17:04:58 -06:00
parent ca11e67a8c
commit 3c70b13fcf
5 changed files with 15 additions and 1 deletions
+6
View File
@@ -12,6 +12,12 @@ Strings are listed by the section of the language file they are in. Example:
This means that three strings were added to the "ScreenDebugOverlay" section, This means that three strings were added to the "ScreenDebugOverlay" section,
"Mute actions", "Mute actions on", and "Mute actions off". "Mute actions", "Mute actions on", and "Mute actions off".
2015/03/27
----------
* [OptionExplanations] AllowSongDeletion
* [OptionTitles] AllowSongDeletion
* [ScreenSelectMusic] PermanentlyDelete
2015/04/08 2015/04/08
---------- ----------
* [OptionExplanations] EditClearPromptThreshold, HarshHotLifePenalty * [OptionExplanations] EditClearPromptThreshold, HarshHotLifePenalty
+4
View File
@@ -4,6 +4,10 @@ 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. from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
________________________________________________________________________________ ________________________________________________________________________________
2015/03/27
----------
* [Select Music] Ability to delete the current song by pressing Ctrl+Backspace added. [Wallacoloo]
2015/03/24 2015/03/24
---------- ----------
* [Sprite/RageTexture] GetTexturePath moved to RageTexture and renamed to * [Sprite/RageTexture] GetTexturePath moved to RageTexture and renamed to
+1
View File
@@ -1866,6 +1866,7 @@ ALL MUSIC=ALL MUSIC
[ScreenSelectMusic] [ScreenSelectMusic]
HeaderText=Select Music HeaderText=Select Music
HeaderSubText=You will pick a cool song! HeaderSubText=You will pick a cool song!
PermanentlyDelete=Permanently delete '%s' ( %s ) from disk?
[ScreenSelectCourse] [ScreenSelectCourse]
HeaderText=Select Course HeaderText=Select Course
+1
View File
@@ -963,6 +963,7 @@ struct recent_note_t
void NoteDataUtil::CalculateRadarValues( const NoteData &in, float fSongSeconds, RadarValues& out ) void NoteDataUtil::CalculateRadarValues( const NoteData &in, float fSongSeconds, RadarValues& out )
{ {
out.Zero();
int curr_row= -1; int curr_row= -1;
bool judgable= false; bool judgable= false;
// recent_notes is used to calculate the voltage. Each element is the row // recent_notes is used to calculate the voltage. Each element is the row
+3 -1
View File
@@ -64,6 +64,8 @@ static RageTimer g_StartedLoadingAt(RageZeroTimer);
static RageTimer g_ScreenStartedLoadingAt(RageZeroTimer); static RageTimer g_ScreenStartedLoadingAt(RageZeroTimer);
RageTimer g_CanOpenOptionsList(RageZeroTimer); RageTimer g_CanOpenOptionsList(RageZeroTimer);
static LocalizedString PERMANENTLY_DELETE("ScreenSelectMusic", "PermanentlyDelete");
REGISTER_SCREEN_CLASS( ScreenSelectMusic ); REGISTER_SCREEN_CLASS( ScreenSelectMusic );
void ScreenSelectMusic::Init() void ScreenSelectMusic::Init()
{ {
@@ -475,7 +477,7 @@ bool ScreenSelectMusic::Input( const InputEventPlus &input )
if ( songToDelete && PREFSMAN->m_bAllowSongDeletion.Get() ) if ( songToDelete && PREFSMAN->m_bAllowSongDeletion.Get() )
{ {
m_pSongAwaitingDeletionConfirmation = songToDelete; m_pSongAwaitingDeletionConfirmation = songToDelete;
ScreenPrompt::Prompt(SM_ConfirmDeleteSong, ssprintf("Permanently delete '%s' ( %s ) from disk?", songToDelete->m_sMainTitle.c_str(), songToDelete->GetSongDir().c_str()), PROMPT_YES_NO); ScreenPrompt::Prompt(SM_ConfirmDeleteSong, ssprintf(PERMANENTLY_DELETE.GetValue(), songToDelete->m_sMainTitle.c_str(), songToDelete->GetSongDir().c_str()), PROMPT_YES_NO);
return true; return true;
} }
} }