MultiplayerRoom -> Room

This commit is contained in:
DrabWeb
2017-05-22 12:44:58 -03:00
parent 87cdf5aac6
commit 03f6cded84
5 changed files with 13 additions and 13 deletions

View File

@ -7,7 +7,7 @@ using osu.Game.Users;
namespace osu.Game.Online.Multiplayer
{
public class MultiplayerRoom
public class Room
{
public string Name { get; set; }
public User Host { get; set; }

View File

@ -18,7 +18,7 @@ using osu.Game.Users;
namespace osu.Game.Screens.Multiplayer
{
public class DrawableMultiplayerRoom : ClickableContainer
public class DrawableRoom : ClickableContainer
{
private const float content_padding = 5;
private const float height = 90;
@ -39,11 +39,11 @@ namespace osu.Game.Screens.Multiplayer
private Color4 playingColour;
private LocalisationEngine localisation;
public readonly Bindable<MultiplayerRoom> Room;
public readonly Bindable<Room> Room;
public DrawableMultiplayerRoom(MultiplayerRoom room)
public DrawableRoom(Room room)
{
Room = new Bindable<MultiplayerRoom>(room);
Room = new Bindable<Room>(room);
RelativeSizeAxes = Axes.X;
Height = height;
@ -206,7 +206,7 @@ namespace osu.Game.Screens.Multiplayer
Room.TriggerChange();
}
private void displayRoom(MultiplayerRoom room)
private void displayRoom(Room room)
{
name.Text = room.Name;
status.Text = room.Status.GetDescription();

View File

@ -425,8 +425,8 @@
<Compile Include="Overlays\Music\PlaylistOverlay.cs" />
<Compile Include="Rulesets\Replays\IAutoGenerator.cs" />
<Compile Include="Rulesets\Replays\AutoGenerator.cs" />
<Compile Include="Screens\Multiplayer\DrawableMultiplayerRoom.cs" />
<Compile Include="Online\Multiplayer\MultiplayerRoom.cs" />
<Compile Include="Screens\Multiplayer\DrawableRoom.cs" />
<Compile Include="Online\Multiplayer\Room.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">