From e66b42e73d84500993e81f19d6e7b5737e9328a9 Mon Sep 17 00:00:00 2001 From: Alberto Ramos Date: Thu, 24 Feb 2011 23:50:50 -0700 Subject: [PATCH 1/2] erased some waste and added something into noteskin.lua for the lifts (not tested, hope it works) --- NoteSkins/pump/default/NoteSkin.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NoteSkins/pump/default/NoteSkin.lua b/NoteSkins/pump/default/NoteSkin.lua index 6baf5572b7..9f12249e34 100644 --- a/NoteSkins/pump/default/NoteSkin.lua +++ b/NoteSkins/pump/default/NoteSkin.lua @@ -118,6 +118,10 @@ local function func() t.BaseRotationZ=Noteskin.BaseRotZ[sButton] end + if sElement == "Tap Lift" then + t.InitCommand=cmd(pulse); + end + return t end From bb1e1a297feafa02ef9a63728adafad5d8b75624 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Feb 2011 00:55:38 -0600 Subject: [PATCH 2/2] try to avoid a crash here, at the expense of it possibly not logging in for some people... please send log info if it happens to you. --- src/ScreenSMOnlineLogin.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ScreenSMOnlineLogin.cpp b/src/ScreenSMOnlineLogin.cpp index bca827b014..d748d60a0d 100644 --- a/src/ScreenSMOnlineLogin.cpp +++ b/src/ScreenSMOnlineLogin.cpp @@ -116,7 +116,16 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM) else if( SM == SM_SMOnlinePack ) { LOG->Trace("[ScreenSMOnlineLogin::HandleScreenMessage] SMOnlinePack"); - sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue() + "\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n" + ENTER_YOUR_PASSWORD.GetValue(); + if(!GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer)) + { + LOG->Warn("Invalid player number: %i", m_iPlayer); + return; + } + + // This can cause problems in certain situations -aj + sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue() + "\n" + + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n" + + ENTER_YOUR_PASSWORD.GetValue(); int ResponseCode = NSMAN->m_SMOnlinePacket.Read1(); if (ResponseCode == 0) {