Merge pull request #5352 from Squiggles211/mp_lobby_fix
Fixes lobby crash when joining MP game
This commit is contained in:
@@ -422,7 +422,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
|
|||||||
|
|
||||||
public static void SetupSpawnWidget(Widget parent, Session.Slot s, Session.Client c)
|
public static void SetupSpawnWidget(Widget parent, Session.Slot s, Session.Client c)
|
||||||
{
|
{
|
||||||
parent.Get<LabelWidget>("SPAWN").GetText = () => (c.SpawnPoint == 0) ? "-" : c.SpawnPoint.ToString();
|
parent.Get<LabelWidget>("SPAWN").GetText = () => (c.SpawnPoint == 0) ? "-" : Convert.ToChar('A' - 1 + c.SpawnPoint).ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetupEditableReadyWidget(Widget parent, Session.Slot s, Session.Client c, OrderManager orderManager, MapPreview map)
|
public static void SetupEditableReadyWidget(Widget parent, Session.Slot s, Session.Client c, OrderManager orderManager, MapPreview map)
|
||||||
|
|||||||
@@ -176,6 +176,11 @@ ScrollPanel@LOBBY_PLAYER_BIN:
|
|||||||
Height: 25
|
Height: 25
|
||||||
X: 390
|
X: 390
|
||||||
Y: 0
|
Y: 0
|
||||||
|
Label@SPAWN:
|
||||||
|
Align: Center
|
||||||
|
X: 445
|
||||||
|
Width: 25
|
||||||
|
Height: 25
|
||||||
Image@STATUS_IMAGE:
|
Image@STATUS_IMAGE:
|
||||||
Visible: false
|
Visible: false
|
||||||
X: 501
|
X: 501
|
||||||
|
|||||||
@@ -169,6 +169,11 @@ ScrollPanel@LOBBY_PLAYER_BIN:
|
|||||||
Align: Center
|
Align: Center
|
||||||
X: 420
|
X: 420
|
||||||
Y: 0
|
Y: 0
|
||||||
|
Label@SPAWN:
|
||||||
|
Align: Center
|
||||||
|
X: 478
|
||||||
|
Width: 23
|
||||||
|
Height: 25
|
||||||
Image@STATUS_IMAGE:
|
Image@STATUS_IMAGE:
|
||||||
Visible: false
|
Visible: false
|
||||||
X: 537
|
X: 537
|
||||||
|
|||||||
@@ -169,6 +169,11 @@ ScrollPanel@LOBBY_PLAYER_BIN:
|
|||||||
Align: Center
|
Align: Center
|
||||||
X: 420
|
X: 420
|
||||||
Y: 0
|
Y: 0
|
||||||
|
Label@SPAWN:
|
||||||
|
Align: Center
|
||||||
|
X: 478
|
||||||
|
Width: 23
|
||||||
|
Height: 25
|
||||||
Image@STATUS_IMAGE:
|
Image@STATUS_IMAGE:
|
||||||
Visible: false
|
Visible: false
|
||||||
X: 537
|
X: 537
|
||||||
|
|||||||
Reference in New Issue
Block a user