diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index ccfb3a36cc..4854100d01 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -30,7 +30,7 @@ ScreenDownloadMachineStats.cpp ScreenDownloadMachineStats.h ScreenEdit.cpp Scree ScreenEditCoursesMenu.cpp ScreenEditCoursesMenu.h EditCoursesSongMenu.cpp EditCoursesSongMenu.h \ ScreenEditMenu.cpp ScreenEditMenu.h ScreenEnding.cpp ScreenEnding.h \ ScreenEndlessBreak.cpp ScreenEndlessBreak.h ScreenEvaluation.cpp ScreenEvaluation.h ScreenExit.cpp ScreenExit.h ScreenNetEvaluation.cpp ScreenNetEvaluation.h \ -ScreenNetSelectMusic.cpp ScreenNetSlectMusic.h ScreenEz2SelectMusic.cpp ScreenEz2SelectMusic.h ScreenEz2SelectPlayer.cpp ScreenEz2SelectPlayer.h \ +ScreenNetSelectMusic.cpp ScreenNetSelectMusic.h ScreenNetSelectBase.cpp ScreenNetSelectBase.h ScreenNetRoom.cpp ScreenNetRoom.h ScreenEz2SelectMusic.cpp ScreenEz2SelectMusic.h ScreenEz2SelectPlayer.cpp ScreenEz2SelectPlayer.h \ ScreenGameOver.cpp ScreenGameOver.h ScreenGameplay.cpp ScreenGameplay.h ScreenHowToPlay.cpp ScreenHowToPlay.h \ ScreenInstructions.cpp ScreenInstructions.h ScreenInsertCredit.cpp ScreenInsertCredit.h \ ScreenJukebox.cpp ScreenJukebox.h \ diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index c401cc785c..5d54da1adb 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -274,6 +274,7 @@ void Screen::ClearMessageQueue( const ScreenMessage SM ) #include "ScreenTestSound.h" #include "ScreenTitleMenu.h" #include "ScreenNetSelectMusic.h" +#include "ScreenNetRoom.h" #include "ScreenNetEvaluation.h" #include "ScreenEz2SelectMusic.h" #include "ScreenRanking.h" @@ -379,6 +380,7 @@ Screen* Screen::Create( CString sClassName ) #if !defined(WITHOUT_NETWORKING) IF_RETURN( ScreenNetworkOptions ); IF_RETURN( ScreenNetSelectMusic ); + IF_RETURN( ScreenNetRoom ); IF_RETURN( ScreenNetEvaluation ); #endif diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp new file mode 100644 index 0000000000..885eab4431 --- /dev/null +++ b/stepmania/src/ScreenNetRoom.cpp @@ -0,0 +1,93 @@ +#include "global.h" + +//XXX: THIS IS JUST A STUB! +//XXX: THIS CLASS IS NOT FUNCTIONAL + +#if !defined(WITHOUT_NETWORKING) +#include "ScreenNetRoom.h" +#include "ScreenManager.h" +#include "NetworkSyncManager.h" +#include "GameState.h" +#include "ThemeManager.h" + +const ScreenMessage SM_SMOnlinePack = ScreenMessage(SM_User+8); //Unused, but should be known + + +ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sName ) +{ + GAMESTATE->FinishStage(); + m_soundChangeSel.Load( THEME->GetPathToS("ScreenNetRoom change sel")); + + NSMAN->ReportNSSOnOff(7); + return; +} + +void ScreenNetRoom::Input( const DeviceInput& DeviceI, const InputEventType type, + const GameInput& GameI, const MenuInput& MenuI, + const StyleInput& StyleI ) +{ + ScreenNetSelectBase::Input( DeviceI, type, GameI, MenuI, StyleI ); +} + +void ScreenNetRoom::HandleScreenMessage( const ScreenMessage SM ) +{ + ScreenNetSelectBase::HandleScreenMessage( SM ); +} + +void ScreenNetRoom::TweenOffScreen() +{ + NSMAN->ReportNSSOnOff(6); +} + +void ScreenNetRoom::Update( float fDeltaTime ) +{ + ScreenNetSelectBase::Update( fDeltaTime ); +} + +void ScreenNetRoom::MenuStart( PlayerNumber pn ) +{ + ScreenNetSelectBase::MenuStart( pn ); +} + +void ScreenNetRoom::MenuBack( PlayerNumber pn ) +{ + ScreenNetSelectBase::MenuBack( pn ); +} + +void ScreenNetRoom::MenuUp( PlayerNumber pn, const InputEventType type ) +{ + ScreenNetSelectBase::MenuUp( pn ); +} + +void ScreenNetRoom::MenuDown( PlayerNumber pn, const InputEventType type ) +{ + ScreenNetSelectBase::MenuDown( pn ); +} + +#endif + +/* + * (c) 2004 Charles Lohr + * All rights reserved. + * Elements from ScreenTextEntry + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/stepmania/src/ScreenNetRoom.h b/stepmania/src/ScreenNetRoom.h new file mode 100644 index 0000000000..c588fb5674 --- /dev/null +++ b/stepmania/src/ScreenNetRoom.h @@ -0,0 +1,55 @@ +/* ScreenNetSelectMusic - A method for Online/Net song selection */ + +#ifndef SCREENNETROOM_H +#define SCREENNETROOM_H + +#include "ScreenWithMenuElements.h" +#include "ScreenNetSelectBase.h" + +class ScreenNetRoom : public ScreenNetSelectBase +{ +public: + ScreenNetRoom( const CString& sName ); + virtual void Input( const DeviceInput& DeviceI, const InputEventType type, + const GameInput& GameI, const MenuInput& MenuI, + const StyleInput& StyleI ); + virtual void HandleScreenMessage( const ScreenMessage SM ); + +protected: + virtual void MenuStart( PlayerNumber pn ); + virtual void MenuUp( PlayerNumber pn, const InputEventType type ); + virtual void MenuDown( PlayerNumber pn, const InputEventType type ); + virtual void MenuBack( PlayerNumber pn ); + + virtual void TweenOffScreen( ); + virtual void Update( float fDeltaTime ); + + RageSound m_soundChangeSel; +}; + +#endif + +/* + * (c) 2004 Charles Lohr + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp new file mode 100644 index 0000000000..7ab065d411 --- /dev/null +++ b/stepmania/src/ScreenNetSelectBase.cpp @@ -0,0 +1,292 @@ +#include "global.h" + +#if !defined(WITHOUT_NETWORKING) +#include "ScreenNetSelectBase.h" +#include "ScreenManager.h" +#include "ThemeManager.h" +#include "RageTimer.h" +#include "ActorUtil.h" +#include "Actor.h" +#include "GameSoundManager.h" +#include "MenuTimer.h" +#include "NetworkSyncManager.h" +#include "RageUtil.h" + +#define CHATINPUT_WIDTH THEME->GetMetricF(m_sName,"ChatInputBoxWidth") +#define CHATINPUT_HEIGHT THEME->GetMetricF(m_sName,"ChatInputBoxHeight") +#define CHATINPUT_COLOR THEME->GetMetricC(m_sName,"ChatInputBoxColor") +#define CHATOUTPUT_WIDTH THEME->GetMetricF(m_sName,"ChatOutputBoxWidth") +#define CHATOUTPUT_HEIGHT THEME->GetMetricF(m_sName,"ChatOutputBoxHeight") +#define CHATOUTPUT_COLOR THEME->GetMetricC(m_sName,"ChatOutputBoxColor") +#define SHOW_CHAT_LINES THEME->GetMetricI(m_sName,"ChatOutputLines") + +#define USERSBG_WIDTH THEME->GetMetricF(m_sName,"UsersBGWidth") +#define USERSBG_HEIGHT THEME->GetMetricF(m_sName,"UsersBGHeight") +#define USERSBG_COLOR THEME->GetMetricC(m_sName,"UsersBGColor") +#define USERSALT_Y THEME->GetMetricF(m_sName,"UsersAY") +#define USERSDELT_X THEME->GetMetricF(m_sName,"UsersDX") +#define USERS_Y THEME->GetMetricF(m_sName,"UsersY") +#define USERS_X THEME->GetMetricF(m_sName,"UsersX") + +const ScreenMessage SM_AddToChat = ScreenMessage(SM_User+4); +const ScreenMessage SM_UsersUpdate = ScreenMessage(SM_User+7); +const ScreenMessage SM_SMOnlinePack = ScreenMessage(SM_User+8); //Unused, but should be known + +ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMenuElements( sName ) +{ + //ChatBox + m_rectChatInputBox.SetDiffuse( CHATINPUT_COLOR ); + m_rectChatInputBox.SetName( "ChatInputBox" ); + m_rectChatInputBox.SetWidth( CHATINPUT_WIDTH ); + m_rectChatInputBox.SetHeight( CHATINPUT_HEIGHT ); + SET_XY_AND_ON_COMMAND( m_rectChatInputBox ); + this->AddChild( &m_rectChatInputBox ); + + m_rectChatOutputBox.SetDiffuse( CHATOUTPUT_COLOR ); + m_rectChatOutputBox.SetName( "ChatOutputBox" ); + m_rectChatOutputBox.SetWidth( CHATOUTPUT_WIDTH ); + m_rectChatOutputBox.SetHeight( CHATOUTPUT_HEIGHT ); + SET_XY_AND_ON_COMMAND( m_rectChatOutputBox ); + this->AddChild( &m_rectChatOutputBox ); + + m_textChatInput.LoadFromFont( THEME->GetPathF(m_sName,"chat") ); + m_textChatInput.SetHorizAlign( align_left ); + m_textChatInput.SetVertAlign( align_top ); + m_textChatInput.SetShadowLength( 0 ); + m_textChatInput.SetName( "ChatInput" ); + m_textChatInput.SetWrapWidthPixels( (int)(CHATINPUT_WIDTH * 2) ); + SET_XY_AND_ON_COMMAND( m_textChatInput ); + this->AddChild( &m_textChatInput ); + + m_textOutHidden.LoadFromFont( THEME->GetPathF(m_sName,"chat") ); + m_textOutHidden.SetWrapWidthPixels( (int)(CHATOUTPUT_WIDTH * 2) ); + + m_textChatOutput.LoadFromFont( THEME->GetPathF(m_sName,"chat") ); + m_textChatOutput.SetHorizAlign( align_left ); + m_textChatOutput.SetVertAlign( align_bottom ); + m_textChatOutput.SetShadowLength( 0 ); + m_textChatOutput.SetName( "ChatOutput" ); + SET_XY_AND_ON_COMMAND( m_textChatOutput ); + this->AddChild( &m_textChatOutput ); + + //Display updated chat (maybe this should be a function)? + m_textOutHidden.SetText( NSMAN->m_sChatText ); + vector wLines; + m_textOutHidden.GetLines( wLines ); + m_actualText = ""; + for (unsigned i = max(int(wLines.size()) - SHOW_CHAT_LINES, 0 ) ; i < wLines.size() ; ++i) + m_actualText += WStringToCString( wLines[i] )+'\n'; + m_textChatOutput.SetText( m_actualText ); + + //Users' Background + + m_rectUsersBG.SetDiffuse( USERSBG_COLOR ); + m_rectUsersBG.SetName( "UsersBG" ); + m_rectUsersBG.SetWidth( USERSBG_WIDTH ); + m_rectUsersBG.SetHeight( USERSBG_HEIGHT ); + SET_XY_AND_ON_COMMAND( m_rectUsersBG ); + this->AddChild( &m_rectUsersBG ); + + //Display users list + UpdateUsers(); + + return; +} + +void ScreenNetSelectBase::Input( const DeviceInput& DeviceI, const InputEventType type, + const GameInput& GameI, const MenuInput& MenuI, + const StyleInput& StyleI ) +{ + if( m_In.IsTransitioning() || m_Out.IsTransitioning() ) + return; + + if( (type != IET_FIRST_PRESS) && (type != IET_SLOW_REPEAT) && (type != IET_FAST_REPEAT ) ) + return; + + bool bHoldingShift = + INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT)) || + INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT)); + + bool bHoldingCtrl = + INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL)) || + INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) || + (!NSMAN->useSMserver); //If we are disconnected, assume no chatting + + switch( DeviceI.button ) + { + case KEY_ENTER: + case KEY_KP_ENTER: + if (!bHoldingCtrl) + { + if ( m_sTextInput != "" ) + NSMAN->SendChat( m_sTextInput ); + m_sTextInput=""; + UpdateTextInput(); + return; + } + break; + case KEY_BACK: + if(!m_sTextInput.empty()) + m_sTextInput = m_sTextInput.erase( m_sTextInput.size()-1 ); + UpdateTextInput(); + break; + default: + char c; + c = DeviceI.ToChar(); + + if( bHoldingShift && !bHoldingCtrl ) + { + c = (char)toupper(c); + + switch( c ) + { + case '`': c='~'; break; + case '1': c='!'; break; + case '2': c='@'; break; + case '3': c='#'; break; + case '4': c='$'; break; + case '5': c='%'; break; + case '6': c='^'; break; + case '7': c='&'; break; + case '8': c='*'; break; + case '9': c='('; break; + case '0': c=')'; break; + case '-': c='_'; break; + case '=': c='+'; break; + case '[': c='{'; break; + case ']': c='}'; break; + case '\'': c='"'; break; + case '\\': c='|'; break; + case ';': c=':'; break; + case ',': c='<'; break; + case '.': c='>'; break; + case '/': c='?'; break; + } + } + if( (c >= ' ') && (!bHoldingCtrl) ) + { + m_sTextInput += c; + UpdateTextInput(); + } + break; + } + Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); // default input handler +} + +void ScreenNetSelectBase::HandleScreenMessage( const ScreenMessage SM ) +{ + Screen::HandleScreenMessage( SM ); + switch( SM ) + { + case SM_GoToPrevScreen: + SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "PrevScreen") ); + break; + case SM_GoToNextScreen: + SOUND->StopMusic(); + SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "NextScreen") ); + break; + case SM_AddToChat: + { + m_textOutHidden.SetText( NSMAN->m_sChatText ); + vector wLines; + m_textOutHidden.GetLines( wLines ); + m_actualText = ""; + for (unsigned i = max(int(wLines.size()) - SHOW_CHAT_LINES, 0 ) ; i < wLines.size() ; ++i) + m_actualText += WStringToCString( wLines[i] )+'\n'; + m_textChatOutput.SetText( m_actualText ); + break; + } + case SM_UsersUpdate: + UpdateUsers(); + break; + + } + +} + +void ScreenNetSelectBase::TweenOffScreen() +{ + OFF_COMMAND( m_rectChatInputBox ); + OFF_COMMAND( m_rectChatOutputBox ); + OFF_COMMAND( m_textChatInput ); + OFF_COMMAND( m_textChatOutput ); + + for( unsigned i=0; iRemoveChild( &m_textUsers[i] ); + + unsigned oldUsers = m_textUsers.size(); + + m_textUsers.clear(); + + m_textUsers.resize( NSMAN->m_ActivePlayer.size() ); + + for( unsigned i=0; i < NSMAN->m_ActivePlayer.size(); i++) + { + m_textUsers[i].LoadFromFont( THEME->GetPathF(m_sName,"chat") ); + m_textUsers[i].SetHorizAlign( align_center ); + m_textUsers[i].SetVertAlign( align_top ); + m_textUsers[i].SetShadowLength( 0 ); + m_textUsers[i].SetName( "Users" ); + + tX += USERSDELT_X; + + if ( (i % 2) == 1) + tY = USERSALT_Y + USERS_Y; + else + tY = USERS_Y; + m_textUsers[i].SetXY( tX, tY ); + + if ( i > oldUsers ) + ON_COMMAND( m_textUsers[i] ); + + m_textUsers[i].SetText( NSMAN->m_PlayerNames[NSMAN->m_ActivePlayer[i]] ); + m_textUsers[i].SetDiffuseColor ( THEME->GetMetricC( m_sName, + ssprintf("Users%dColor", NSMAN->m_PlayerStatus[NSMAN->m_ActivePlayer[i]] ) ) ); + + this->AddChild( &m_textUsers[i] ); + } +} + +#endif + +/* + * (c) 2004 Charles Lohr + * All rights reserved. + * Elements from ScreenTextEntry + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/stepmania/src/ScreenNetSelectBase.h b/stepmania/src/ScreenNetSelectBase.h new file mode 100644 index 0000000000..b4d74d7800 --- /dev/null +++ b/stepmania/src/ScreenNetSelectBase.h @@ -0,0 +1,66 @@ +/* ScreenNetSelectBase - Base screen containing chat room & user list */ + +#ifndef SCREENNETSELECTBASE_H +#define SCREENNETSELECTBASE_H + +#include "ScreenWithMenuElements.h" +#include "Sprite.h" +#include "Quad.h" +#include "BitmapText.h" + +class ScreenNetSelectBase : public ScreenWithMenuElements +{ +public: + ScreenNetSelectBase( const CString& sName ); + + virtual void Input( const DeviceInput& DeviceI, const InputEventType type, + const GameInput& GameI, const MenuInput& MenuI, + const StyleInput& StyleI ); + virtual void HandleScreenMessage( const ScreenMessage SM ); + virtual void TweenOffScreen(); + + void UpdateUsers(); + void UpdateTextInput(); +private: + //Chatting + BitmapText m_textChatInput; + BitmapText m_textChatOutput; + BitmapText m_textOutHidden; + Quad m_rectChatInputBox; + Quad m_rectChatOutputBox; + CString m_sTextInput; + CString m_actualText; + + //Users Rect + Quad m_rectUsersBG; + vector m_textUsers; +}; + +#endif + +/* + * (c) 2004 Charles Lohr + * All rights reserved. + * + * based off of ScreenEz2SelectMusic by "Frieza" + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/stepmania/src/ScreenNetSelectMusic.h b/stepmania/src/ScreenNetSelectMusic.h index 77d0a02d98..07b1d1955a 100644 --- a/stepmania/src/ScreenNetSelectMusic.h +++ b/stepmania/src/ScreenNetSelectMusic.h @@ -3,6 +3,7 @@ #ifndef SCREENNETSELECTMUSIC_H #define SCREENNETSELECTMUSIC_H +#include "ScreenNetSelectBase.h" #include "ScreenWithMenuElements.h" #include "Sprite.h" #include "Quad.h" @@ -14,13 +15,11 @@ #include "Difficulty.h" #include "DifficultyMeter.h" -class ScreenNetSelectMusic : public ScreenWithMenuElements +class ScreenNetSelectMusic : public ScreenNetSelectBase { public: ScreenNetSelectMusic( const CString& sName ); - virtual void DrawPrimitives(); - virtual void Update( float fDeltaTime ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput& GameI, const MenuInput& MenuI, const StyleInput& StyleI ); @@ -61,18 +60,7 @@ protected: void MusicChanged(); void TweenOffScreen(); - - void UpdateUsers(); private: - //Chatting - BitmapText m_textChatInput; - BitmapText m_textChatOutput; - BitmapText m_textOutHidden; - Quad m_rectChatInputBox; - Quad m_rectChatOutputBox; - CString m_sTextInput; - CString m_actualText; - //Selection Quad m_rectSelection; @@ -93,10 +81,6 @@ private: BitmapText m_textSubtitle; BitmapText m_textGroup; - //Users Rect - Quad m_rectUsersBG; - vector m_textUsers; - //Difficulty Icon(s) DifficultyIcon m_DifficultyIcon[NUM_PLAYERS]; Difficulty m_DC[NUM_PLAYERS]; diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index 2fb8fa8100..a5ff59b87c 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -384,6 +384,18 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + + + + + + diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 7c3a9cbd17..345d6a461d 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -379,6 +379,18 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + + + + + + diff --git a/stepmania/src/StepManiaXbox.vcproj b/stepmania/src/StepManiaXbox.vcproj index 628d5400ae..d5859f204c 100644 --- a/stepmania/src/StepManiaXbox.vcproj +++ b/stepmania/src/StepManiaXbox.vcproj @@ -518,6 +518,18 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ + + + + + + + +