Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit 2a96c86

Browse files
author
KillaMaaki
committed
Fixed formatting
1 parent ffcbb35 commit 2a96c86

File tree

3 files changed

+87
-65
lines changed

3 files changed

+87
-65
lines changed

‎browser/webext/netcode.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ window.netcode = {
147147
var clientId = args[0];
148148
_clients[clientId] = {
149149
_recvCallbacks: [],
150-
_stateChangeCallbacks: [],
150+
_stateChangeCallbacks: [],
151151
_isDestroyed: false,
152152
setTickRate: function(tickRate, callback) {
153153
if (this._isDestroyed) {
@@ -184,9 +184,9 @@ window.netcode = {
184184
if (type == "receive") {
185185
this._recvCallbacks.push(callback);
186186
}
187-
else if(type == "stateChange") {
188-
this._stateChangeCallbacks.push(callback);
189-
}
187+
else if(type == "stateChange") {
188+
this._stateChangeCallbacks.push(callback);
189+
}
190190
},
191191
};
192192
callback(null, _clients[clientId]);
@@ -221,15 +221,15 @@ window.addEventListener("message", function(event) {
221221
_clients[clientId]._isDestroyed = true;
222222
delete _clients[clientId];
223223
// TODO: Fire event before deletion.
224-
} else if (resultType == _typeClientStateChanged) {
224+
} else if (resultType == _typeClientStateChanged) {
225225
// Client state changed
226-
var clientId = event.data.message[1];
227-
var stateStr = event.data.message[2];
228-
if(_clients[clientId] != undefined) {
229-
for (var i = 0; i < _clients[clientId]._stateChangeCallbacks.length; i++) {
226+
var clientId = event.data.message[1];
227+
var stateStr = event.data.message[2];
228+
if(_clients[clientId] != undefined) {
229+
for (var i = 0; i < _clients[clientId]._stateChangeCallbacks.length; i++) {
230230
_clients[clientId]._stateChangeCallbacks[i](clientId, stateStr);
231231
}
232-
}
232+
}
233233
} else {
234234
// Received a return value.
235235
var messageId = event.data.message[1];

‎netcode.io.demoserver/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void Main(string[] args)
8282
// Run netcode.io server in another thread.
8383
var netcodeThread = new Thread(NetcodeServer);
8484
netcodeThread.IsBackground = !nonInteractive;
85-
netcodeThread.Start();
85+
netcodeThread.Start();
8686

8787
Console.WriteLine("netcode.io demo server started, open up http://" + httpAddress + ":" + httpPort + "/ to try it!");
8888
if (!nonInteractive)

‎netcode.io.host/Program.cs‎

Lines changed: 76 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ManagedClient
4242
const int TypeDestroyClient = 107;
4343
const int TypeClientDestroyed = 108;
4444
const int TypeCheckPresence = 109;
45-
const int TypeClientStateChanged = 110;
45+
const int TypeClientStateChanged = 110;
4646

4747
const int ResultClientCreated = 201;
4848
const int ResultSuccess = 202;
@@ -259,18 +259,18 @@ private static void ClientRun(object o)
259259
var id = (int)o;
260260
var managedClient = _clients[id];
261261

262-
// keep track of client state so we can notify application of state changes
263-
var prevState = managedClient.client.State;
262+
// keep track of client state so we can notify application of state changes
263+
var prevState = managedClient.client.State;
264264

265265
while (managedClient.shouldRun)
266266
{
267267
managedClient.client.Update(managedClient.time);
268268

269-
if (managedClient.client.State != prevState)
270-
{
271-
prevState = managedClient.client.State;
272-
PostStateChange(id);
273-
}
269+
if (managedClient.client.State != prevState)
270+
{
271+
prevState = managedClient.client.State;
272+
PostStateChange(id);
273+
}
274274

275275
if (managedClient.client.State == ClientState.Connected)
276276
{
@@ -313,52 +313,74 @@ private static void ClientRun(object o)
313313
managedClient.client.Dispose();
314314
}
315315

316-
private static void PostStateChange( int id )
317-
{
318-
string state;
319-
switch (_clients[id].client.State)
320-
{
321-
case ClientState.Connected:
322-
state = "connected";
323-
break;
324-
case ClientState.ConnectionDenied:
325-
state = "connectionDenied";
326-
break;
327-
case ClientState.ConnectionRequestTimeout:
328-
state = "connectionRequestTimeout";
329-
break;
330-
case ClientState.ConnectionResponseTimeout:
331-
state = "connectionResponseTimeout";
332-
break;
333-
case ClientState.ConnectionTimedOut:
334-
state = "connectionTimedOut";
335-
break;
336-
case ClientState.ConnectTokenExpired:
337-
state = "connectTokenExpired";
338-
break;
339-
case ClientState.Disconnected:
340-
state = "disconnected";
341-
break;
342-
case ClientState.InvalidConnectToken:
343-
state = "invalidConnectToken";
344-
break;
345-
case ClientState.SendingConnectionRequest:
346-
state = "sendingConnectionRequest";
347-
break;
348-
case ClientState.SendingConnectionResponse:
349-
state = "sendingConnectionResponse";
350-
break;
351-
default:
352-
state = "unknown";
353-
break;
354-
}
316+
private static void PostStateChange( int id )
317+
{
318+
string state;
319+
switch (_clients[id].client.State)
320+
{
321+
case ClientState.Connected:
322+
{
323+
state = "connected";
324+
break;
325+
}
326+
case ClientState.ConnectionDenied:
327+
{
328+
state = "connectionDenied";
329+
break;
330+
}
331+
case ClientState.ConnectionRequestTimeout:
332+
{
333+
state = "connectionRequestTimeout";
334+
break;
335+
}
336+
case ClientState.ConnectionResponseTimeout:
337+
{
338+
state = "connectionResponseTimeout";
339+
break;
340+
}
341+
case ClientState.ConnectionTimedOut:
342+
{
343+
state = "connectionTimedOut";
344+
break;
345+
}
346+
case ClientState.ConnectTokenExpired:
347+
{
348+
state = "connectTokenExpired";
349+
break;
350+
}
351+
case ClientState.Disconnected:
352+
{
353+
state = "disconnected";
354+
break;
355+
}
356+
case ClientState.InvalidConnectToken:
357+
{
358+
state = "invalidConnectToken";
359+
break;
360+
}
361+
case ClientState.SendingConnectionRequest:
362+
{
363+
state = "sendingConnectionRequest";
364+
break;
365+
}
366+
case ClientState.SendingConnectionResponse:
367+
{
368+
state = "sendingConnectionResponse";
369+
break;
370+
}
371+
default:
372+
{
373+
state = "unknown";
374+
break;
375+
}
376+
}
355377

356-
WriteMessage(new JArray
357-
{
358-
JValue.FromObject(TypeClientStateChanged),
359-
JValue.FromObject(id),
360-
JValue.FromObject(state),
361-
});
362-
}
378+
WriteMessage(new JArray
379+
{
380+
JValue.FromObject(TypeClientStateChanged),
381+
JValue.FromObject(id),
382+
JValue.FromObject(state),
383+
});
384+
}
363385
}
364386
}

0 commit comments

Comments
 (0)