Update ScreenNetRoom.cpp

etternagame · Jan 29, 2017 · f4ae232 · f4ae232
1 parent e3e0917
commit f4ae232
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/src/ScreenNetRoom.cpp b/src/ScreenNetRoom.cpp
@@ -196,26 +196,33 @@ void ScreenNetRoom::TweenOffScreen()
 
 bool ScreenNetRoom::MenuStart( const InputEventPlus &input )
 {
+	SelectCurrent();
+	ScreenNetSelectBase::MenuStart( input );
+	return true;
+}
+
+void ScreenNetRoom::SelectCurrent()
+{
+
 	m_RoomWheel.Select();
-	RoomWheelItemData* rwd = dynamic_cast<RoomWheelItemData*>( m_RoomWheel.LastSelected() ); 
-	if( rwd )
+	RoomWheelItemData* rwd = dynamic_cast<RoomWheelItemData*>(m_RoomWheel.LastSelected());
+	if (rwd)
 	{
-		if ( rwd->m_iFlags % 2 )
+		if (rwd->m_iFlags % 2)
 		{
 			m_sLastPickedRoom = rwd->m_sText;
-			ScreenTextEntry::TextEntry( SM_BackFromReqPass, ENTER_ROOM_REQPASSWORD, "", 255 );
-		} 
+			ScreenTextEntry::TextEntry(SM_BackFromReqPass, ENTER_ROOM_REQPASSWORD, "", 255);
+		}
 		else
 		{
 			NSMAN->m_SMOnlinePacket.ClearPacket();
-			NSMAN->m_SMOnlinePacket.Write1( 1 );
-			NSMAN->m_SMOnlinePacket.Write1( 1 ); //Type (enter a room)
-			NSMAN->m_SMOnlinePacket.WriteNT( rwd->m_sText );
-			NSMAN->SendSMOnline( );
+			NSMAN->m_SMOnlinePacket.Write1(1);
+			NSMAN->m_SMOnlinePacket.Write1(1); //Type (enter a room)
+			NSMAN->m_SMOnlinePacket.WriteNT(rwd->m_sText);
+			NSMAN->SendSMOnline();
 		}
 	}
-	ScreenNetSelectBase::MenuStart( input );
-	return true;
+	return;
 }
 
 bool ScreenNetRoom::MenuBack( const InputEventPlus &input )
@@ -330,10 +337,14 @@ class LunaScreenNetRoom : public Luna<ScreenNetRoom>
 		p->GetRoomWheel()->PushSelf(L);
 		return 1;
 	}
+	static int SelectCurrent(T* p, lua_State *L) {
+		p->SelectCurrent();
+		return 1;
+	}
 	LunaScreenNetRoom()
 	{
 		ADD_METHOD(GetMusicWheel);
-	}
+		ADD_METHOD(SelectCurrent);
 };
 
 LUA_REGISTER_DERIVED_CLASS(ScreenNetRoom, ScreenNetSelectBase)