This commit is contained in:
Josh Allen
2006-08-14 15:48:47 +00:00
parent b83e620713
commit 48753f4447
+9 -8
View File
@@ -28,6 +28,12 @@ AutoScreenMessage( SM_BackFromRoomName )
AutoScreenMessage( SM_BackFromRoomDesc ) AutoScreenMessage( SM_BackFromRoomDesc )
AutoScreenMessage( SM_BackFromRoomPass ) AutoScreenMessage( SM_BackFromRoomPass )
AutoScreenMessage( SM_BackFromReqPass ) AutoScreenMessage( SM_BackFromReqPass )
AutoScreenMessage( SM_RoomInfoRetract )
AutoScreenMessage( SM_RoomInfoDeploy )
static LocalizedString ENTER_ROOM_DESCRIPTION ("ScreenNetRoom","Enter a description for the room:");
static LocalizedString ENTER_ROOM_PASSWORD ("ScreenNetRoom","Enter a password for the room (blank, no password):");
static LocalizedString ENTER_ROOM_REQPASSWORD ("ScreenNetRoom","Enter Room's Password:");
REGISTER_SCREEN_CLASS( ScreenNetRoom ); REGISTER_SCREEN_CLASS( ScreenNetRoom );
@@ -55,13 +61,13 @@ void ScreenNetRoom::Init()
SET_XY_AND_ON_COMMAND( m_textTitle ); SET_XY_AND_ON_COMMAND( m_textTitle );
this->AddChild( &m_textTitle); this->AddChild( &m_textTitle);
m_RoomWheel.Load("RoomWheel");
m_RoomWheel.SetName( "RoomWheel" ); m_RoomWheel.SetName( "RoomWheel" );
m_RoomWheel.Load( "RoomWheel" );
m_RoomWheel.BeginScreen(); m_RoomWheel.BeginScreen();
SET_XY( m_RoomWheel ); SET_XY_AND_ON_COMMAND( m_RoomWheel );
this->AddChild( &m_RoomWheel ); this->AddChild( &m_RoomWheel );
ON_COMMAND( m_RoomWheel );
m_roomInfo.SetName( "RoomInfoDisplay" );
m_roomInfo.Load( "RoomInfoDisplay" ); m_roomInfo.Load( "RoomInfoDisplay" );
m_roomInfo.SetDrawOrder( 1 ); m_roomInfo.SetDrawOrder( 1 );
this->AddChild( &m_roomInfo ); this->AddChild( &m_roomInfo );
@@ -78,9 +84,6 @@ void ScreenNetRoom::Input( const InputEventPlus &input )
ScreenNetSelectBase::Input( input ); ScreenNetSelectBase::Input( input );
} }
static LocalizedString ENTER_ROOM_DESCRIPTION ("ScreenNetRoom","Enter a description for the room:");
static LocalizedString ENTER_ROOM_PASSWORD ("ScreenNetRoom","Enter a password for the room (blank, no password):");
static LocalizedString ENTER_ROOM_REQPASSWORD ("ScreenNetRoom","Enter Room's Password:");
void ScreenNetRoom::HandleScreenMessage( const ScreenMessage SM ) void ScreenNetRoom::HandleScreenMessage( const ScreenMessage SM )
{ {
if( SM == SM_GoToPrevScreen ) if( SM == SM_GoToPrevScreen )
@@ -254,9 +257,7 @@ void ScreenNetRoom::MenuLeft( const InputEventPlus &input )
void ScreenNetRoom::MenuRight( const InputEventPlus &input ) void ScreenNetRoom::MenuRight( const InputEventPlus &input )
{ {
if( input.type == IET_FIRST_PRESS ) if( input.type == IET_FIRST_PRESS )
{
m_RoomWheel.Move(1); m_RoomWheel.Move(1);
}
ScreenNetSelectBase::MenuRight( input.MenuI.player ); ScreenNetSelectBase::MenuRight( input.MenuI.player );
} }