actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge with default

Browse Source
This commit is contained in:
Henrik Andersson
2011-07-16 19:37:31 +02:00
parent 4083036c56 9882c8ab9c
commit 68eec5aa0f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Languages/en.ini
+1 -1
View File
@@ -372,7 +372,7 @@ MaxTextureResolution=Choose the maximum texture resolution. Setting this to any
MenuTimer=When &oq;ON&cq;, menus have a time limit. MenuTimer=When &oq;ON&cq;, menus have a time limit.
Mines=Mines Mines=Mines
MoveRandomToEnd=Determines if courses with random songs should be placed at the end of the course select wheel. MoveRandomToEnd=Determines if courses with random songs should be placed at the end of the course select wheel.
MovieColorDepth=Choose the color depth of textures. 32 bit textures use more memory, but look nicer. MovieColorDepth=Choose the color depth of movies. 32 bit textures use more memory, but look nicer.
MusicWheelSwitchSpeed=Adjusts the speed of the music wheel. MusicWheelSwitchSpeed=Adjusts the speed of the music wheel.
MusicWheelUsesSections=&oq;Always&cq; means sections in group + ABC; &oq;Never&cq; means no sections; &oq;Title Only&cq; shows sections in ABC order. MusicWheelUsesSections=&oq;Always&cq; means sections in group + ABC; &oq;Never&cq; means no sections; &oq;Title Only&cq; shows sections in ABC order.
Network Options=Connect to a server or change server options. Network Options=Connect to a server or change server options.
src/ScreenOptionsToggleSongs.cpp
+2 -3
View File
@@ -11,7 +11,6 @@
// main page (group list) // main page (group list)
REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongs ); REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongs );
REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
void ScreenOptionsToggleSongs::BeginScreen() void ScreenOptionsToggleSongs::BeginScreen()
{ {
@@ -49,8 +48,7 @@ void ScreenOptionsToggleSongs::ProcessMenuStart( const InputEventPlus &input )
// switch to the subpage with the specified group // switch to the subpage with the specified group
int iRow = GetCurrentRow(); int iRow = GetCurrentRow();
OptionRow &row = *m_pRows[iRow]; if( m_pRows[iRow]->GetRowType() == OptionRow::RowType_Exit )
if( row.GetRowType() == OptionRow::RowType_Exit )
{ {
ScreenOptions::ProcessMenuStart( input ); ScreenOptions::ProcessMenuStart( input );
return; return;
@@ -70,6 +68,7 @@ void ScreenOptionsToggleSongs::ExportOptions( int row, const vector<PlayerNumber
} }
// subpage (has the songs in a specific group) // subpage (has the songs in a specific group)
REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
void ScreenOptionsToggleSongsSubPage::BeginScreen() void ScreenOptionsToggleSongsSubPage::BeginScreen()
{ {
m_apSongs.clear(); m_apSongs.clear();
src/StatsManager.cpp
+4
View File
@@ -242,10 +242,14 @@ void StatsManager::CommitStatsToProfiles( const StageStats *pSS )
pPlayerProfile->m_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size(); pPlayerProfile->m_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size();
} }
LOG->Trace("Adding stats to machine profile...");
AddPlayerStatsToProfile( pMachineProfile, *pSS, pn ); AddPlayerStatsToProfile( pMachineProfile, *pSS, pn );
if( pPlayerProfile ) if( pPlayerProfile )
{
LOG->Trace("Adding stats to player profile...");
AddPlayerStatsToProfile( pPlayerProfile, *pSS, pn ); AddPlayerStatsToProfile( pPlayerProfile, *pSS, pn );
}
CHECKPOINT; CHECKPOINT;
} }