diff --git a/OpenRa.FileFormats/Format80.cs b/OpenRa.FileFormats/Format80.cs index 380dd0001a..76d9655e30 100644 --- a/OpenRa.FileFormats/Format80.cs +++ b/OpenRa.FileFormats/Format80.cs @@ -31,8 +31,8 @@ namespace OpenRa.FileFormats { static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count ) { - if( srcIndex >= destIndex ) - throw new NotImplementedException( string.Format( "srcIndex >= destIndex {0} {1}", srcIndex, destIndex ) ); + if( srcIndex > destIndex ) + throw new NotImplementedException( string.Format( "srcIndex > destIndex {0} {1}", srcIndex, destIndex ) ); if( destIndex - srcIndex == 1 ) { diff --git a/OpenRa.Game/Cursor.cs b/OpenRa.Game/Cursor.cs index bbc748bab7..96c9c613c5 100644 --- a/OpenRa.Game/Cursor.cs +++ b/OpenRa.Game/Cursor.cs @@ -35,5 +35,6 @@ namespace OpenRa public static Cursor Repair { get { return new Cursor("repair"); } } public static Cursor RepairBlocked { get { return new Cursor("repair-blocked"); } } public static Cursor PowerDown { get { return new Cursor("powerdown"); } } + public static Cursor PowerDownBlocked { get { return new Cursor("powerdown-blocked"); } } } } diff --git a/OpenRa.Game/Orders/PowerDownOrderGenerator.cs b/OpenRa.Game/Orders/PowerDownOrderGenerator.cs index 0878f49464..a8f40b7309 100644 --- a/OpenRa.Game/Orders/PowerDownOrderGenerator.cs +++ b/OpenRa.Game/Orders/PowerDownOrderGenerator.cs @@ -39,7 +39,7 @@ namespace OpenRa.Orders { mi.Button = MouseButton.Left; return OrderInner(world, xy, mi).Any() - ? Cursor.PowerDown : Cursor.RepairBlocked; + ? Cursor.PowerDown : Cursor.PowerDownBlocked; } } } diff --git a/artsrc/powerdown-cursors.psd b/artsrc/powerdown-cursors.psd new file mode 100644 index 0000000000..6178de233a Binary files /dev/null and b/artsrc/powerdown-cursors.psd differ diff --git a/mods/ra/sequences.xml b/mods/ra/sequences.xml index babbc2f263..82bc9ecbc5 100644 --- a/mods/ra/sequences.xml +++ b/mods/ra/sequences.xml @@ -406,8 +406,9 @@ - - + + + diff --git a/nopower.shp b/nopower.shp new file mode 100644 index 0000000000..49792f87ce Binary files /dev/null and b/nopower.shp differ