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

Merge pull request #4832 from ScottNZ/guard-og-fix

Browse Source 
Fix Guard OG crash #4821
This commit is contained in:
Matthias Mailänder
2014-03-08 12:33:08 +01:00
parent 19ac138275 c777c621e0
commit 6190b7794b
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -22,6 +22,7 @@ NEW:
Removed the ability of commandos to plant C4 on walls. Removed the ability of commandos to plant C4 on walls.
Order lines are now shown on unit selection. Order lines are now shown on unit selection.
Fixed chat synchronization in replays. Fixed chat synchronization in replays.
Fixed the game sometimes crashing when deploying and activating the guard cursor at the same time.
Dune 2000: Dune 2000:
Added the Atreides grenadier from the 1.06 patch. Added the Atreides grenadier from the 1.06 patch.
Added randomized tiles for Sand and Rock terrain. Added randomized tiles for Sand and Rock terrain.

3
OpenRA.Mods.RA/Guard.cs
View File

@@ -84,6 +84,9 @@ namespace OpenRA.Mods.RA
public string GetCursor(World world, CPos xy, MouseInput mi) public string GetCursor(World world, CPos xy, MouseInput mi)
{ {
if (!subjects.Any())
return null;
var multiple = subjects.Count() > 1; var multiple = subjects.Count() > 1;
var canGuard = FriendlyGuardableUnits(world, mi) var canGuard = FriendlyGuardableUnits(world, mi)
.Any(a => multiple || a != subjects.First()); .Any(a => multiple || a != subjects.First());