epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set spectator color to white & remove selector.

Browse Source
This commit is contained in:
Paul Chote
2013-06-26 22:26:17 +12:00
parent 859af00f1c
commit 1fce900801
5 changed files with 15 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -137,6 +137,7 @@ namespace OpenRA.Mods.RA.Server
{
client.Slot = null;
client.SpawnPoint = 0;
client.Color = HSLColor.FromRGB(255, 255, 255);
server.SyncLobbyInfo();
return true;
}},
@@ -530,8 +531,8 @@ namespace OpenRA.Mods.RA.Server
if (targetClient.Index != client.Index && !client.IsAdmin)
return true;
// Map has disabled color changes
if (targetClient.Slot != null && server.lobbyInfo.Slots[targetClient.Slot].LockColor)
// Spectator or map has disabled color changes
if (targetClient.Slot == null || server.lobbyInfo.Slots[targetClient.Slot].LockColor)
return true;
var ci = parts[1].Split(',').Select(cc => int.Parse(cc)).ToArray();

2
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -459,7 +459,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
template = EditableSpectatorTemplate.Clone();
LobbyUtils.SetupEditableNameWidget(template, null, c, orderManager);
LobbyUtils.SetupEditableColorWidget(template, null, c, orderManager, colorPreview);
}
// Non-editable spectator
else
@@ -469,7 +468,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
LobbyUtils.SetupNameWidget(template, null, client);
LobbyUtils.SetupKickWidget(template, null, client, orderManager);
LobbyUtils.SetupColorWidget(template, null, client);
}
LobbyUtils.SetupClientWidget(template, null, c, orderManager, true);

25
mods/cnc/chrome/lobby.yaml
View File

@@ -295,23 +295,11 @@ Container@SERVER_LOBBY:
Width:190
Height:25
MaxLength:16
DropDownButton@COLOR:
Width:70
Height:25
X:210
Font:Regular
IgnoreChildMouseOver: true
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
Label@SPECTATOR:
Text:Spectator
Width:250
Width:315-55
Height:25
X:255
X:210
Y:0
Align:Center
Font:Bold
@@ -358,16 +346,11 @@ Container@SERVER_LOBBY:
X:180
Y:2
Font:Bold
ColorBlock@COLORBLOCK:
X:215
Y:6
Width:35
Height:13
Label@SPECTATOR:
Text:Spectator
Width:250
Width:315-55
Height:25
X:255
X:210
Y:0
Align:Center
Font:Bold

24
mods/d2k/chrome/lobby.yaml
View File

@@ -273,22 +273,11 @@ Background@SERVER_LOBBY:
Width:135
Height:25
MaxLength:16
DropDownButton@COLOR:
Width:80
Height:25
X:160
Font:Regular
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
Label@SPECTATOR:
Text:Spectator
Width:225
Width:278
Height:25
X:245
X:160
Y:0
Align:Center
Font:Bold
@@ -334,16 +323,11 @@ Background@SERVER_LOBBY:
X:125
Y:2
Font:Bold
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Label@SPECTATOR:
Text:Spectator
Width:225
Width:278
Height:25
X:245
X:160
Y:0
Align:Center
Font:Bold

24
mods/ra/chrome/lobby.yaml
View File

@@ -273,22 +273,11 @@ Background@SERVER_LOBBY:
Width:135
Height:25
MaxLength:16
DropDownButton@COLOR:
Width:80
Height:25
X:160
Font:Regular
Children:
ColorBlock@COLORBLOCK:
X:5
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
Label@SPECTATOR:
Text:Spectator
Width:225
Width:278
Height:25
X:245
X:160
Y:0
Align:Center
Font:Bold
@@ -334,16 +323,11 @@ Background@SERVER_LOBBY:
X:125
Y:2
Font:Bold
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Label@SPECTATOR:
Text:Spectator
Width:225
Width:278
Height:25
X:245
X:160
Y:0
Align:Center
Font:Bold