Took out the server ticks business because we're going to do delta times
in a more general purpose manner. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1403 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// $Id: Client.java,v 1.25 2002/05/28 22:07:13 mdb Exp $
|
// $Id: Client.java,v 1.26 2002/05/28 22:54:43 mdb Exp $
|
||||||
|
|
||||||
package com.threerings.presents.client;
|
package com.threerings.presents.client;
|
||||||
|
|
||||||
@@ -215,17 +215,6 @@ public class Client
|
|||||||
return stamp + _serverDelta;
|
return stamp + _serverDelta;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts a server tick stamp (which is the number of milliseconds
|
|
||||||
* since the server started up) to an absolute client timestamp.
|
|
||||||
*/
|
|
||||||
public long fromServerTicks (int ticks)
|
|
||||||
{
|
|
||||||
// we already have our adjusted server start stamp, so we just add
|
|
||||||
// the milliseconds since that time to get absolute time
|
|
||||||
return _serverStartStamp + ticks;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if we are logged on, false if we're not.
|
* Returns true if we are logged on, false if we're not.
|
||||||
*/
|
*/
|
||||||
@@ -387,9 +376,6 @@ public class Client
|
|||||||
// extract bootstrap information
|
// extract bootstrap information
|
||||||
_cloid = data.clientOid;
|
_cloid = data.clientOid;
|
||||||
|
|
||||||
// keep track of our server start time
|
|
||||||
_serverStartStamp = data.serverStartStamp;
|
|
||||||
|
|
||||||
// send a few pings to the server to establish the clock offset
|
// send a few pings to the server to establish the clock offset
|
||||||
// between this client and server standard time
|
// between this client and server standard time
|
||||||
establishClockDelta();
|
establishClockDelta();
|
||||||
@@ -412,8 +398,6 @@ public class Client
|
|||||||
// we're either done with our calculations, so we can grab the
|
// we're either done with our calculations, so we can grab the
|
||||||
// time delta and finish our business...
|
// time delta and finish our business...
|
||||||
_serverDelta = _dcalc.getTimeDelta();
|
_serverDelta = _dcalc.getTimeDelta();
|
||||||
// adjust our server start stamp into client time
|
|
||||||
_serverStartStamp += _serverDelta;
|
|
||||||
// free up our delta calculator
|
// free up our delta calculator
|
||||||
_dcalc = null;
|
_dcalc = null;
|
||||||
// let the client continue with its initialization
|
// let the client continue with its initialization
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// $Id: BootstrapData.java,v 1.5 2002/05/28 21:56:38 mdb Exp $
|
// $Id: BootstrapData.java,v 1.6 2002/05/28 22:54:43 mdb Exp $
|
||||||
|
|
||||||
package com.threerings.presents.net;
|
package com.threerings.presents.net;
|
||||||
|
|
||||||
@@ -18,7 +18,4 @@ public class BootstrapData extends DObject
|
|||||||
|
|
||||||
/** The oid to which to send invocation requests. */
|
/** The oid to which to send invocation requests. */
|
||||||
public int invOid;
|
public int invOid;
|
||||||
|
|
||||||
/** The time from which server ticks are incrementing. */
|
|
||||||
public long serverStartStamp;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user