Merge pull request #3552 from pchote/playtest-hotfix

Playtest hotfix
This commit is contained in:
Matthias Mailänder
2013-07-13 02:23:48 -07:00
3 changed files with 6 additions and 14 deletions

View File

@@ -4,8 +4,8 @@ hard work of many contributors.
The OpenRA developers are:
* Chris Forbes (chrisf)
* Curtis Shmyr (hamb)
* Paul Chote (pchote)
* Matthias Mailänder (Mailaender)
* Paul Chote (pchote)
* ScottNZ
Previous developers included:
@@ -18,9 +18,9 @@ Previous developers included:
Also thanks to:
* Akseli Virtanen (RAGEQUIT)
* Andrew Aldridge (i80and)
* Andrew Perkins
* Andrew Riedi
* Andrew Aldridge (i80and)
* Andreas Beck (baxtor)
* Barnaby Smith (mvi)
* Bellator
@@ -44,11 +44,11 @@ Also thanks to:
* Kyrre Soerensen (zypres)
* Lawrence Wang
* Lesueur Benjamin (Valkirie)
* Maarten Meuris (Nyerguds)
* Mark Olson (markolson)
* Matthew Gatland (mgatland)
* Maarten Meuris (Nyerguds)
* Max Ugrumov (katzsmile)
* Max621
* Max Ugrumov (katzsmile)
* Nukem
* Olaf van der Spek
* Paolo Chiodi (paolochiodi)

View File

@@ -25,7 +25,6 @@ namespace OpenRA.Server
public int ExpectLength = 8;
public int Frame = 0;
public int MostRecentFrame = 0;
public const int MaxOrderLength = 4096;
/* client data */
public int PlayerIndex;
@@ -66,7 +65,7 @@ namespace OpenRA.Server
if (e.SocketErrorCode == SocketError.WouldBlock) break;
server.DropClient(this);
Log.Write("server", "Dropping client {0} because reading the data failed: {1}", PlayerIndex, e);
Log.Write("server", "Dropping client {0} because reading the data failed: {1}", this.PlayerIndex.ToString(), e);
return false;
}
}
@@ -87,13 +86,6 @@ namespace OpenRA.Server
ExpectLength = BitConverter.ToInt32(bytes, 0) - 4;
Frame = BitConverter.ToInt32(bytes, 4);
State = ReceiveState.Data;
if (ExpectLength < 0 || ExpectLength > MaxOrderLength)
{
server.DropClient(this);
Log.Write("server", "Dropping client {0} for excessive order length = {1}", PlayerIndex, ExpectLength);
return;
}
} break;
case ReceiveState.Data:

View File

@@ -29,7 +29,7 @@ Container@CREDITS_PANEL:
VAlign:Top
Button@BACK_BUTTON:
X:PARENT_RIGHT-140
Y:400
Y:399
Width:140
Height:35
Text:Back