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

Begin to unhack unit movement/cursors; Flying units no longer show move-blocked cursor on water

Browse Source
This commit is contained in:
Paul Chote
2009-12-21 03:09:47 -08:00
parent 7fa1da0d7d
commit 7aea135113
9 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRa.Game/Controller.cs
View File

@@ -128,11 +128,12 @@ namespace OpenRa.Game
Cursor CursorForOrderString( string s, Actor a, int2 location )
{
var movement = a.traits.WithInterface<IMovement>().FirstOrDefault();
switch( s )
{
case "Attack": return Cursor.Attack;
case "Move":
if( Game.IsCellBuildable( location, a.Info.WaterBound ? UnitMovementType.Float : UnitMovementType.Wheel, a ) )
if (movement.CanEnterCell(location))
return Cursor.Move;
else
return Cursor.MoveBlocked;
@@ -143,12 +144,12 @@ namespace OpenRa.Game
else
return Cursor.DeployBlocked;
case "ActivatePortableChronoshift": return Cursor.Deploy;
case "UsePortableChronoshift":
if (Game.IsCellBuildable(location, a.Info.WaterBound ? UnitMovementType.Float : UnitMovementType.Wheel, a))
case "UsePortableChronoshift":
if (movement.CanEnterCell(location))
return Cursor.Chronoshift;
else
return Cursor.MoveBlocked;
case "DeliverOre": return Cursor.Enter;
case "Enter": return Cursor.Enter;
case "Harvest": return Cursor.Attack; // TODO: special harvest cursor?
default:
return null;