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

stripped out dead netplay code

Browse Source
This commit is contained in:
Chris Forbes
2009-10-29 20:12:32 +13:00
parent f010a8957f
commit 704dd5a885
6 changed files with 104 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
OpenRa.Game/Controller.cs
View File

@@ -8,26 +8,26 @@ using System.Drawing;
using OpenRa.Game.Traits;
namespace OpenRa.Game
{
class Controller
{
{
class Controller
{
public IOrderGenerator orderGenerator;
List<Order> recentOrders = new List<Order>();
void ApplyOrders(float2 xy, bool left)
{
void ApplyOrders(float2 xy, bool left)
{
var doVoice = null as Actor;
if( orderGenerator != null )
foreach( var order in orderGenerator.Order( xy.ToInt2(), left ) )
if (orderGenerator != null)
foreach (var order in orderGenerator.Order(xy.ToInt2(), left))
{
recentOrders.Add( order );
recentOrders.Add(order);
//UnitOrders.ProcessOrder( order );
if( order.Subject != null && order.Player == Game.LocalPlayer )
if (order.Subject != null && order.Player == Game.LocalPlayer)
doVoice = order.Subject;
}
if( doVoice != null )
Game.PlaySound( Game.SovietVoices.First.GetNext() + GetVoiceSuffix( doVoice ), false );
}
if (doVoice != null)
Game.PlaySound(Game.SovietVoices.First.GetNext() + GetVoiceSuffix(doVoice), false);
}
public List<Order> GetRecentOrders()
@@ -35,89 +35,89 @@ namespace OpenRa.Game
var ret = recentOrders;
recentOrders = new List<Order>();
return ret;
}
static string GetVoiceSuffix( Actor unit )
{
var suffixes = new[] { ".r01", ".r03" };
return suffixes[ unit.traits.Get<Traits.Mobile>().Voice ];
}
float2 dragStart, dragEnd;
public void HandleMouseInput(MouseInput mi)
{
var xy = Game.viewport.ViewToWorld(mi);
if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down)
{
if (!(orderGenerator is PlaceBuilding))
dragStart = dragEnd = xy;
ApplyOrders(xy, true);
}
if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Move)
dragEnd = xy;
if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Up)
{
if (!(orderGenerator is PlaceBuilding))
{
if (dragStart != xy)
orderGenerator = new UnitOrderGenerator(
Game.SelectUnitsInBox( Game.CellSize * dragStart, Game.CellSize * xy ) );
else
orderGenerator = new UnitOrderGenerator(
Game.SelectUnitOrBuilding( Game.CellSize * xy ) );
}
dragStart = dragEnd = xy;
}
if (mi.Button == MouseButtons.None && mi.Event == MouseInputEvent.Move)
{
/* update the cursor to reflect the thing under us - note this
* needs to also happen when the *thing* changes, so per-frame hook */
dragStart = dragEnd = xy;
}
if (mi.Button == MouseButtons.Right && mi.Event == MouseInputEvent.Down)
ApplyOrders(xy, false);
}
public Pair<float2, float2>? SelectionBox
{
get
{
if (dragStart == dragEnd) return null;
return Pair.New(Game.CellSize * dragStart, Game.CellSize * dragEnd);
}
}
public Cursor ChooseCursor()
{
var uog = orderGenerator as UnitOrderGenerator;
if (uog != null)
uog.selection.RemoveAll(a => a.IsDead);
if (uog != null && uog.selection.Count > 0
&& uog.selection.Any(a => a.traits.Contains<Traits.Mobile>())
&& uog.selection.All( a => a.Owner == Game.LocalPlayer ))
{
var umts = uog.selection.Select(a => a.traits.GetOrDefault<Mobile>())
.Where(m => m != null)
.Select(m => m.GetMovementType())
.Distinct();
if (!umts.Any( umt => Game.IsCellBuildable( dragEnd.ToInt2(), umt ) ))
return Cursor.MoveBlocked;
return Cursor.Move;
}
if (Game.SelectUnitOrBuilding(Game.CellSize * dragEnd).Any())
return Cursor.Select;
return Cursor.Default;
}
}
static string GetVoiceSuffix(Actor unit)
{
var suffixes = new[] { ".r01", ".r03" };
return suffixes[unit.traits.Get<Traits.Mobile>().Voice];
}
float2 dragStart, dragEnd;
public void HandleMouseInput(MouseInput mi)
{
var xy = Game.viewport.ViewToWorld(mi);
if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down)
{
if (!(orderGenerator is PlaceBuilding))
dragStart = dragEnd = xy;
ApplyOrders(xy, true);
}
if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Move)
dragEnd = xy;
if (mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Up)
{
if (!(orderGenerator is PlaceBuilding))
{
if (dragStart != xy)
orderGenerator = new UnitOrderGenerator(
Game.SelectUnitsInBox(Game.CellSize * dragStart, Game.CellSize * xy));
else
orderGenerator = new UnitOrderGenerator(
Game.SelectUnitOrBuilding(Game.CellSize * xy));
}
dragStart = dragEnd = xy;
}
if (mi.Button == MouseButtons.None && mi.Event == MouseInputEvent.Move)
{
/* update the cursor to reflect the thing under us - note this
* needs to also happen when the *thing* changes, so per-frame hook */
dragStart = dragEnd = xy;
}
if (mi.Button == MouseButtons.Right && mi.Event == MouseInputEvent.Down)
ApplyOrders(xy, false);
}
public Pair<float2, float2>? SelectionBox
{
get
{
if (dragStart == dragEnd) return null;
return Pair.New(Game.CellSize * dragStart, Game.CellSize * dragEnd);
}
}
public Cursor ChooseCursor()
{
var uog = orderGenerator as UnitOrderGenerator;
if (uog != null)
uog.selection.RemoveAll(a => a.IsDead);
if (uog != null && uog.selection.Count > 0
&& uog.selection.Any(a => a.traits.Contains<Traits.Mobile>())
&& uog.selection.All(a => a.Owner == Game.LocalPlayer))
{
var umts = uog.selection.Select(a => a.traits.GetOrDefault<Mobile>())
.Where(m => m != null)
.Select(m => m.GetMovementType())
.Distinct();
if (!umts.Any(umt => Game.IsCellBuildable(dragEnd.ToInt2(), umt)))
return Cursor.MoveBlocked;
return Cursor.Move;
}
if (Game.SelectUnitOrBuilding(Game.CellSize * dragEnd).Any())
return Cursor.Select;
return Cursor.Default;
}
}
}