From 19fadc3e0a402f413d24cea536fd0d8337aefa4e Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 27 Jan 2010 22:09:30 +1300 Subject: [PATCH] fixed powerdown/blocked cursors --- OpenRa.FileFormats/Format80.cs | 4 ++-- OpenRa.Game/Cursor.cs | 1 + OpenRa.Game/Orders/PowerDownOrderGenerator.cs | 2 +- artsrc/powerdown-cursors.psd | Bin 0 -> 26683 bytes mods/ra/sequences.xml | 5 +++-- nopower.shp | Bin 0 -> 572 bytes 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 artsrc/powerdown-cursors.psd create mode 100644 nopower.shp 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 0000000000000000000000000000000000000000..6178de233aa585dbcd031e98847b73867c4f7851 GIT binary patch literal 26683 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 n8kV(-W$j{Ew!Cfa(h57vD#Wr1Xc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..49792f87ceab2aef30404f32e75ede7ffe41105b GIT binary patch literal 572 zcmZ9Iv1{8v7{%W;Y2%XNR7xwU(?R}#sCX@{lb8gOMMI$=IyhOf1`4GV3O=1XwNvMV zc1kn1pbmk|33lwro`k0^vJ~5b?&aK1jUj124NpjS@Atm9h;kfy%6SSjOI=}C+M4Un zxjwm7{=FXa959Pe@meWdMur37wBp(A1E^^w_iUA?iCLzv#Td41!dBg0a{2}IQppmp ze)a?JCt0N!!WG+a<)pSM_pzypVQRUk%C7%d75Tn(tcGbW4poum2aa_@r+LGnlXtDJ z*f9%$>ZaqGqo!FRP9(>>5NN!?QAl`7C|sHNtHKROBWt@A6?u00mI>FgTcc5)pM7E& zdUiOOc3(n%qzjW?0QteZphD(L`d3S88O#C%2!p`fBdX#}vsA9$i4k%x9#n~DGWHZ)~J~?S(^&^-&(CrQy&UvS7 z+b4g2@6u*1tvT;+ApQ>VYi>Vy_FwuN=6};i(cm-8ZSWh8s{ak%UTQO