From 9ee1a2ce43668c677b63e60c3a9db1320f2bd2d6 Mon Sep 17 00:00:00 2001
From: Josh Allen <axlecrusher@users.sourceforge.net>
Date: Sat, 22 Jul 2006 00:28:26 +0000
Subject: [PATCH] Use flags found in RoomWheelData and clean up

---
 stepmania/src/ScreenNetRoom.cpp | 38 ++++++---------------------------
 stepmania/src/ScreenNetRoom.h   |  5 +----
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp
index 819760a07f..31f7325189 100644
--- a/stepmania/src/ScreenNetRoom.cpp
+++ b/stepmania/src/ScreenNetRoom.cpp
@@ -196,32 +196,15 @@ void ScreenNetRoom::TweenOffScreen()
 	NSMAN->ReportNSSOnOff(6);
 }
 
-/*
-void ScreenNetRoom::Update( float fDeltaTime )
-{
-	ScreenNetSelectBase::Update( fDeltaTime );
-}
-*/
-
 void ScreenNetRoom::MenuStart( PlayerNumber pn )
 {
 	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
-		//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 )
+		if ( rwd->m_iFlags % 2 )
 		{
-			m_sLastPickedRoom = m_RoomWheel.LastSelected()->m_sText;
+			m_sLastPickedRoom = rwd->m_sText;
 			ScreenTextEntry::TextEntry( SM_BackFromReqPass, ENTER_ROOM_REQPASSWORD, "", 255 );
 		} 
 		else
@@ -229,7 +212,7 @@ void ScreenNetRoom::MenuStart( PlayerNumber pn )
 			NSMAN->m_SMOnlinePacket.ClearPacket();
 			NSMAN->m_SMOnlinePacket.Write1( 1 );
 			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( );
 		}
 	}
@@ -245,16 +228,6 @@ void ScreenNetRoom::MenuBack( PlayerNumber 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 )
 {
 	if( input.type == IET_FIRST_PRESS )
@@ -304,6 +277,7 @@ void ScreenNetRoom::UpdateRoomsList()
 
 		itemData->m_sText = m_Rooms[i].Name();
 		itemData->m_sDesc = m_Rooms[i].Description();
+		itemData->m_iFlags = m_Rooms[i].GetFlags();
 
 		switch (m_Rooms[i].State())
 		{
diff --git a/stepmania/src/ScreenNetRoom.h b/stepmania/src/ScreenNetRoom.h
index 65b973349c..08a50da834 100644
--- a/stepmania/src/ScreenNetRoom.h
+++ b/stepmania/src/ScreenNetRoom.h
@@ -34,12 +34,9 @@ public:
 
 protected:
 	virtual void MenuStart( PlayerNumber pn );
-	virtual void MenuUp( const InputEventPlus &input );
-	virtual void MenuDown( const InputEventPlus &input );
 	virtual void MenuBack( PlayerNumber pn );
 
 	virtual void TweenOffScreen( );
-//	virtual void Update( float fDeltaTime );
 
 private:
 	void UpdateRoomsList();
@@ -65,7 +62,7 @@ private:
 #endif
 
 /*
- * (c) 2004 Charles Lohr
+ * (c) 2004 Charles Lohr, Joshua Allen
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a