git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5678 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Dave Hoover
2009-03-04 21:33:49 +00:00
parent 1566d00c75
commit 7cd3f69ff6
@@ -370,7 +370,7 @@ public class Client
*/ */
public long fromServerTime (long stamp) public long fromServerTime (long stamp)
{ {
// when we calcuated our time delta, we did it such that: C - S = dT, thus to convert // when we calculated our time delta, we did it such that: C - S = dT, thus to convert
// server to client time we do: C = S + dT // server to client time we do: C = S + dT
return stamp + _serverDelta; return stamp + _serverDelta;
} }
@@ -380,7 +380,7 @@ public class Client
*/ */
public long toServerTime (long stamp) public long toServerTime (long stamp)
{ {
// when we calcuated our time delta, we did it such that: C - S = dT, thus to convert // when we calculated our time delta, we did it such that: C - S = dT, thus to convert
// server to client time we do: S = C - dT // server to client time we do: S = C - dT
return stamp - _serverDelta; return stamp - _serverDelta;
} }
@@ -911,9 +911,8 @@ public class Client
setServer(_hostname, _ports, _datagramPorts); setServer(_hostname, _ports, _datagramPorts);
if (!logon()) { if (!logon()) {
log.warning("logon() failed during server switch? [hostname=" + _hostname + log.warning("logon() failed during server switch?",
", ports=" + StringUtil.toString(_ports) + ", datagramPorts=" + "hostname", _hostname, "ports", _ports, "datagramPorts", _datagramPorts);
StringUtil.toString(_datagramPorts) + "].");
clientFailedToLogon(Client.this, new Exception("logon() failed?")); clientFailedToLogon(Client.this, new Exception("logon() failed?"));
} }
} }
@@ -964,7 +963,7 @@ public class Client
/** The unique id of our connection. */ /** The unique id of our connection. */
protected int _connectionId = -1; protected int _connectionId = -1;
/** Our client distribted object id. */ /** Our client distributed object id. */
protected int _cloid = -1; protected int _cloid = -1;
/** Our client distributed object. */ /** Our client distributed object. */