From ebb91feb4a2cb90fe5de509447702eb6d1f38f5c Mon Sep 17 00:00:00 2001 From: Flameshadowxeroshin Date: Sat, 7 Apr 2012 20:18:03 +0000 Subject: [PATCH 1/3] why not. --- src/PlayerStageStats.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/PlayerStageStats.cpp b/src/PlayerStageStats.cpp index 3730dfcf78..0de3f0560d 100644 --- a/src/PlayerStageStats.cpp +++ b/src/PlayerStageStats.cpp @@ -760,6 +760,12 @@ public: } return 0; } + + static int FailPlayer( T* p, lua_State *L ) + { + p->m_bFailed = true; + return 0; + } LunaPlayerStageStats() { @@ -801,6 +807,7 @@ public: ADD_METHOD( SetScore ); ADD_METHOD( GetCurMaxScore ); ADD_METHOD( SetCurMaxScore ); + ADD_METHOD( FailPlayer ); } }; From 64e74f48248fc99b948871d0c094e0ff49f9a8e6 Mon Sep 17 00:00:00 2001 From: Flameshadowxeroshin Date: Sat, 7 Apr 2012 21:21:18 +0000 Subject: [PATCH 2/3] Fix some nasty behavior with ALSA thanks to custos-mundi (of irc.freenode.net #alsa) and /// --- src/arch/Sound/ALSA9Helpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/Sound/ALSA9Helpers.cpp b/src/arch/Sound/ALSA9Helpers.cpp index d2caa8ce99..caf02920a7 100644 --- a/src/arch/Sound/ALSA9Helpers.cpp +++ b/src/arch/Sound/ALSA9Helpers.cpp @@ -130,7 +130,7 @@ static RString DeviceName() { if( !PREFSMAN->m_iSoundDevice.Get().empty() ) return PREFSMAN->m_iSoundDevice; - return "hw:0"; + return "default"; } void Alsa9Buf::GetSoundCardDebugInfo() From 33348f0743e0aa1ab41c14a92c05b495a0e6d1a5 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 8 Apr 2012 11:12:30 -0500 Subject: [PATCH 3/3] [ScreenNetworkOptions] Fixed a bug where localized text would not show up properly. Fixes issue 759. --- Docs/Changelog_sm5.txt | 5 +++++ src/ScreenNetworkOptions.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index c6e242c503..0fbb20f553 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -9,6 +9,11 @@ ________________________________________________________________________________ StepMania 5.0 alpha 2 | 201204?? -------------------------------------------------------------------------------- +2012/04/08 +---------- +* [ScreenNetworkOptions] Fixed a bug where localized text would not show up + properly. Fixes issue 759. [AJ] + 2012/04/06 ---------- * Modify Jousway's planned noteskin to allow it to work with Technomotion diff --git a/src/ScreenNetworkOptions.cpp b/src/ScreenNetworkOptions.cpp index 0658a6a2ce..02d6cf4f8e 100644 --- a/src/ScreenNetworkOptions.cpp +++ b/src/ScreenNetworkOptions.cpp @@ -52,6 +52,7 @@ void ScreenNetworkOptions::Init() vHands.push_back( pHand ); pHand->m_Def.m_sName = "Connection"; pHand->m_Def.m_bOneChoiceForAllPlayers = true; + pHand->m_Def.m_bAllowThemeItems = false; if ( NSMAN->useSMserver ) pHand->m_Def.m_vsChoices.push_back(CLIENT_DISCONNECT); else @@ -63,6 +64,7 @@ void ScreenNetworkOptions::Init() pHand->m_Def.m_sName = "Scoreboard"; pHand->m_Def.m_vsChoices.clear(); pHand->m_Def.m_bOneChoiceForAllPlayers = true; + pHand->m_Def.m_bAllowThemeItems = false; pHand->m_Def.m_vsChoices.push_back(SCORE_OFF); pHand->m_Def.m_vsChoices.push_back(SCORE_ON); }