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

added protocol versioning. AssignPlayer order is dead.

Browse Source
This commit is contained in:
Chris Forbes
2010-01-25 18:29:56 +13:00
parent 0998e1f17b
commit be8bb20e82
7 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRa.Game/Game.cs
View File

@@ -87,7 +87,6 @@ namespace OpenRa
internal static void Initialize(string mapName, Renderer renderer, int2 clientSize, int localPlayer, Controller controller)
{
//localPlayerIndex = localPlayer;
Game.renderer = renderer;
Game.clientSize = clientSize;
@@ -102,7 +101,6 @@ namespace OpenRa
ChangeMap(mapName);
if (Settings.Replay != "")
//orderManager = new OrderManager(new IOrderSource[] { new ReplayOrderSource(Settings.Replay) });
throw new NotImplementedException();
else
{
@@ -197,6 +195,9 @@ namespace OpenRa
LobbyInfo = session;
if (Game.orderManager.Connection.ConnectionState == ConnectionState.Connected)
world.SetLocalPlayer(Game.orderManager.Connection.LocalClientId);
if (Game.orderManager.FramesAhead != LobbyInfo.GlobalSettings.OrderLatency
&& !Game.orderManager.GameStarted)
{
@@ -277,14 +278,6 @@ namespace OpenRa
new Order( "ToggleReady", Game.world.LocalPlayer.PlayerActor, "" ) { IsImmediate = true } );
}
/* temporary hack: DO NOT LEAVE IN */
if( e.KeyCode == Keys.F2 )
Game.world.LocalPlayer = Game.world.players[ ( Game.world.LocalPlayer.Index + 1 ) % 4 ];
if( e.KeyCode == Keys.F3 )
Game.controller.orderGenerator = new SellOrderGenerator();
if( e.KeyCode == Keys.F4 )
Game.controller.orderGenerator = new RepairOrderGenerator();
if( !Game.chat.isChatting )
if( e.KeyCode >= Keys.D0 && e.KeyCode <= Keys.D9 )
Game.controller.DoControlGroup( world, (int)e.KeyCode - (int)Keys.D0, (Modifiers)(int)e.Modifiers );