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

hack it so it works

Browse Source
This commit is contained in:
Chris Forbes
2010-05-05 17:46:32 +12:00
parent 74564c7b0a
commit 3bd3fd5e56
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Game.cs
View File

@@ -437,6 +437,7 @@ namespace OpenRA
public static void DispatchMouseInput(MouseInputEvent ev, MouseEventArgs e, Modifiers modifierKeys) public static void DispatchMouseInput(MouseInputEvent ev, MouseEventArgs e, Modifiers modifierKeys)
{ {
int sync = world.SyncHash(); int sync = world.SyncHash();
var initialWorld = world;
if (ev == MouseInputEvent.Down) if (ev == MouseInputEvent.Down)
lastPos = new int2(e.Location); lastPos = new int2(e.Location);
@@ -459,7 +460,7 @@ namespace OpenRA
Modifiers = modifierKeys, Modifiers = modifierKeys,
}); });
if( sync != world.SyncHash() ) if( sync != world.SyncHash() && world == initialWorld )
throw new InvalidOperationException( "Desync in DispatchMouseInput" ); throw new InvalidOperationException( "Desync in DispatchMouseInput" );
} }
@@ -602,8 +603,13 @@ namespace OpenRA
public static void Disconnect() public static void Disconnect()
{ {
var shellmap = new Manifest(LobbyInfo.GlobalSettings.Mods).ShellmapUid;
LobbyInfo = new Session();
JoinLocal(); JoinLocal();
LoadShellMap(new Manifest(LobbyInfo.GlobalSettings.Mods).ShellmapUid); LoadShellMap(shellmap);
Chrome.rootWidget.CloseWindow();
Chrome.rootWidget.OpenWindow("MAINMENU_BG");
} }
} }
} }