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

Use flags found in RoomWheelData and clean up

Browse Source
This commit is contained in:
Josh Allen
2006-07-22 00:28:26 +00:00
parent 8c7e01eb08
commit 9ee1a2ce43
2 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenNetRoom.cpp
+6 -32
View File
@@ -196,32 +196,15 @@ void ScreenNetRoom::TweenOffScreen()
NSMAN->ReportNSSOnOff(6); NSMAN->ReportNSSOnOff(6);
} }
/*
void ScreenNetRoom::Update( float fDeltaTime )
{
ScreenNetSelectBase::Update( fDeltaTime );
}
*/
void ScreenNetRoom::MenuStart( PlayerNumber pn ) void ScreenNetRoom::MenuStart( PlayerNumber pn )
{ {
m_RoomWheel.Select(); m_RoomWheel.Select();
if (m_RoomWheel.LastSelected() != NULL) RoomWheelData* rwd = (RoomWheelData*)m_RoomWheel.LastSelected();
if (rwd)
{ {
//XXX: Big yuck, we should put the flags, and state position in RoomWheelData. That way if ( rwd->m_iFlags % 2 )
//we don't have to search for it. Realistically, this isn't going to slow us down, since at
//peak time SMOnline has never had more than 55 rooms in any one section.
int iPlace;
for ( iPlace = 0; iPlace < m_Rooms.size(); iPlace++ )
if ( m_Rooms[iPlace].Name() == m_RoomWheel.LastSelected()->m_sText )
break;
if ( iPlace == m_Rooms.size() )
return;
if ( m_Rooms[iPlace].GetFlags() % 2 )
{ {
m_sLastPickedRoom = m_RoomWheel.LastSelected()->m_sText; m_sLastPickedRoom = rwd->m_sText;
ScreenTextEntry::TextEntry( SM_BackFromReqPass, ENTER_ROOM_REQPASSWORD, "", 255 ); ScreenTextEntry::TextEntry( SM_BackFromReqPass, ENTER_ROOM_REQPASSWORD, "", 255 );
} }
else else
@@ -229,7 +212,7 @@ void ScreenNetRoom::MenuStart( PlayerNumber pn )
NSMAN->m_SMOnlinePacket.ClearPacket(); NSMAN->m_SMOnlinePacket.ClearPacket();
NSMAN->m_SMOnlinePacket.Write1( 1 ); NSMAN->m_SMOnlinePacket.Write1( 1 );
NSMAN->m_SMOnlinePacket.Write1( 1 ); //Type (enter a room) NSMAN->m_SMOnlinePacket.Write1( 1 ); //Type (enter a room)
NSMAN->m_SMOnlinePacket.WriteNT( m_RoomWheel.LastSelected()->m_sText ); NSMAN->m_SMOnlinePacket.WriteNT( rwd->m_sText );
NSMAN->SendSMOnline( ); NSMAN->SendSMOnline( );
} }
} }
@@ -245,16 +228,6 @@ void ScreenNetRoom::MenuBack( PlayerNumber pn )
ScreenNetSelectBase::MenuBack( pn ); ScreenNetSelectBase::MenuBack( pn );
} }
void ScreenNetRoom::MenuUp( const InputEventPlus &input )
{
ScreenNetSelectBase::MenuUp( input.MenuI.player );
}
void ScreenNetRoom::MenuDown( const InputEventPlus &input )
{
ScreenNetSelectBase::MenuDown( input.MenuI.player );
}
void ScreenNetRoom::MenuLeft( const InputEventPlus &input ) void ScreenNetRoom::MenuLeft( const InputEventPlus &input )
{ {
if( input.type == IET_FIRST_PRESS ) if( input.type == IET_FIRST_PRESS )
@@ -304,6 +277,7 @@ void ScreenNetRoom::UpdateRoomsList()
itemData->m_sText = m_Rooms[i].Name(); itemData->m_sText = m_Rooms[i].Name();
itemData->m_sDesc = m_Rooms[i].Description(); itemData->m_sDesc = m_Rooms[i].Description();
itemData->m_iFlags = m_Rooms[i].GetFlags();
switch (m_Rooms[i].State()) switch (m_Rooms[i].State())
{ {
stepmania/src/ScreenNetRoom.h
+1 -4
View File
@@ -34,12 +34,9 @@ public:
protected: protected:
virtual void MenuStart( PlayerNumber pn ); virtual void MenuStart( PlayerNumber pn );
virtual void MenuUp( const InputEventPlus &input );
virtual void MenuDown( const InputEventPlus &input );
virtual void MenuBack( PlayerNumber pn ); virtual void MenuBack( PlayerNumber pn );
virtual void TweenOffScreen( ); virtual void TweenOffScreen( );
// virtual void Update( float fDeltaTime );
private: private:
void UpdateRoomsList(); void UpdateRoomsList();
@@ -65,7 +62,7 @@ private:
#endif #endif
/* /*
* (c) 2004 Charles Lohr * (c) 2004 Charles Lohr, Joshua Allen
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a