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

Merge commit 'pchote/master'

Browse Source
This commit is contained in:
Chris Forbes
2010-01-03 22:58:40 +13:00
parent 4427228c97 428c14d333
commit 56db75ae32
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRa.Game/Chrome.cs
View File

@@ -258,7 +258,7 @@ namespace OpenRa.Game
else
{
//repairButton.ReplaceAnim(Game.controller.orderGenerator is RepairOrderGenerator ? "pressed" : "normal");
AddButton(chronoshiftRect, isLmb => Game.controller.ToggleInputMode<ChronosphereSelectOrderGenerator>());
AddButton(chronoshiftRect, isLmb => HandleChronosphereButton());
}
buildPaletteRenderer.DrawSprite(repairButton.Image, chronoshiftDrawPos, PaletteType.Chrome);
@@ -291,6 +291,12 @@ namespace OpenRa.Game
buildPaletteRenderer.Flush();
}
void HandleChronosphereButton()
{
Sound.Play("slcttgt1.aud");
Game.controller.ToggleInputMode<ChronosphereSelectOrderGenerator>();
}
void DrawChat()
{
var chatpos = new int2(400, Game.viewport.Height - 20);

1
OpenRa.Game/Cursor.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRa.Game
public static Cursor Select { get { return new Cursor("select"); } }
public static Cursor MoveBlocked { get { return new Cursor("move-blocked"); } }
public static Cursor Attack { get { return new Cursor("attack"); } }
public static Cursor AttackMove { get { return new Cursor("attackmove"); } }
public static Cursor Deploy { get { return new Cursor("deploy"); } }
public static Cursor Enter { get { return new Cursor("enter"); } }
public static Cursor DeployBlocked { get { return new Cursor("deploy-blocked"); } }

2
OpenRa.Game/Orders/UnitOrderGenerator.cs
View File

@@ -84,7 +84,7 @@ namespace OpenRa.Game.Orders
case "Deliver": return Cursor.Enter;
case "Infiltrate": return Cursor.Enter;
case "Capture": return Cursor.Capture;
case "Harvest": return Cursor.Attack; // TODO: special harvest cursor?
case "Harvest": return Cursor.AttackMove;
default:
return null;
}

8
sequences.xml
View File

@@ -368,7 +368,7 @@
<sequence name="move" start="10" length="4" x="12" y="12" />
<sequence name="move-blocked" start="14" x="12" y="12" />
<sequence name="select" start="15" length="6" x="12" y="12" />
<sequence name="attack" start="21" length="8" x="12" y="12" />
<sequence name="attackmove" start="21" length="8" x="12" y="12" />
<sequence name="move-minimap" start="29" length="6" />
<sequence name="repair" start="35" length="24" />
<sequence name="deploy" start="59" length="9" x="12" y="12" />
@@ -384,7 +384,7 @@
<sequence name="repair-blocked" start="120" length="1" />
<sequence name="c4-minimap" start="121" length="3" />
<sequence name="scroll-blocked" start="124" length="8" />
<sequence name="attack-minimap" start="134" length="8" />
<sequence name="attackmove-minimap" start="134" length="8" />
<sequence name="enter-minimap" start="142" length="3" />
<sequence name="guard-minimap" start="146" length="1" />
<sequence name="guard" start="147" length="1" x="12" y="12" />
@@ -394,8 +394,8 @@
<sequence name="capture-minimap" start="167" length="3" />
<sequence name="repair2" start="170" length="24" />
<sequence name="heal-minimap" start="194" length="1" />
<sequence name="attack2" start="195" length="8" x="12" y="12" />
<sequence name="attack2-minimap" start="203" length="8" />
<sequence name="attack" start="195" length="8" x="12" y="12" />
<sequence name="attack-minimap" start="203" length="8" />
<sequence name="deploy-blocked" start="211" length="1" x="12" y="12" />
<sequence name="enter-blocked" start="212" length="1" />
<sequence name="repair2-blocked" start="213" length="1" />