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

Merge pull request #8653 from abcdefg30/botsettings

Browse Source 
Fix Team set in PlayerReference being ignored for unplayable players
This commit is contained in:
Pavel Penev
2015-07-05 20:44:41 +03:00
parent da3bf9bf8d 85345d83c6
commit b4c1625f1c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View File

@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
var team = item.Get<LabelWidget>("TEAM"); var team = item.Get<LabelWidget>("TEAM");
var teamNumber = (client == null) ? 0 : client.Team; var teamNumber = pp.PlayerReference.Playable ? ((client == null) ? 0 : client.Team) : pp.PlayerReference.Team;
team.GetText = () => (teamNumber == 0) ? "-" : teamNumber.ToString(); team.GetText = () => (teamNumber == 0) ? "-" : teamNumber.ToString();
playerPanel.AddChild(item); playerPanel.AddChild(item);

10
mods/ra/maps/fort-lonestar/map.yaml
View File

@@ -41,7 +41,7 @@ Players:
Playable: True Playable: True
AllowBots: False AllowBots: False
LockTeam: True LockTeam: True
Team: 0 Team: 1
LockRace: True LockRace: True
Race: allies Race: allies
Allies: Multi1, Multi2, Multi3 Allies: Multi1, Multi2, Multi3
@@ -51,7 +51,7 @@ Players:
Playable: True Playable: True
AllowBots: False AllowBots: False
LockTeam: True LockTeam: True
Team: 0 Team: 1
LockRace: True LockRace: True
Race: allies Race: allies
Allies: Multi0, Multi2, Multi3 Allies: Multi0, Multi2, Multi3
@@ -61,7 +61,7 @@ Players:
Playable: True Playable: True
AllowBots: False AllowBots: False
LockTeam: True LockTeam: True
Team: 0 Team: 1
LockRace: True LockRace: True
Race: allies Race: allies
Allies: Multi0, Multi1, Multi3 Allies: Multi0, Multi1, Multi3
@@ -71,7 +71,7 @@ Players:
Playable: True Playable: True
AllowBots: False AllowBots: False
LockTeam: True LockTeam: True
Team: 0 Team: 1
LockRace: True LockRace: True
Race: allies Race: allies
Allies: Multi0, Multi1, Multi2 Allies: Multi0, Multi1, Multi2
@@ -79,6 +79,8 @@ Players:
PlayerReference@Soviets: PlayerReference@Soviets:
Name: Soviets Name: Soviets
Race: soviet Race: soviet
LockTeam: True
Team: 2
ColorRamp: 0,255,128 ColorRamp: 0,255,128
Enemies: Multi0, Multi1, Multi2, Multi3 Enemies: Multi0, Multi1, Multi2, Multi3