Need to mark our last move request time regardless of whether we have a
pending request outstanding. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1457 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// $Id: LocationDirector.java,v 1.21 2002/06/14 00:57:48 mdb Exp $
|
// $Id: LocationDirector.java,v 1.22 2002/06/14 01:19:16 mdb Exp $
|
||||||
|
|
||||||
package com.threerings.crowd.client;
|
package com.threerings.crowd.client;
|
||||||
|
|
||||||
@@ -105,12 +105,17 @@ public class LocationDirector
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// we need to call this both to mark that we're issuing a move
|
||||||
|
// request and to check to see if the last issued request should
|
||||||
|
// be considered stale
|
||||||
|
boolean refuse = checkRepeatMove();
|
||||||
|
|
||||||
// complain if we're over-writing a pending request
|
// complain if we're over-writing a pending request
|
||||||
if (_pendingPlaceId != -1) {
|
if (_pendingPlaceId != -1) {
|
||||||
// if the pending request has been outstanding more than a
|
// if the pending request has been outstanding more than a
|
||||||
// minute, go ahead and let this new one through in an attempt
|
// minute, go ahead and let this new one through in an attempt
|
||||||
// to recover from dropped moveTo requests
|
// to recover from dropped moveTo requests
|
||||||
if (checkRepeatMove()) {
|
if (refuse) {
|
||||||
Log.warning("Refusing moveTo; We have a request outstanding " +
|
Log.warning("Refusing moveTo; We have a request outstanding " +
|
||||||
"[ppid=" + _pendingPlaceId +
|
"[ppid=" + _pendingPlaceId +
|
||||||
", npid=" + placeId + "].");
|
", npid=" + placeId + "].");
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// $Id: SceneDirector.java,v 1.16 2002/06/14 00:57:49 mdb Exp $
|
// $Id: SceneDirector.java,v 1.17 2002/06/14 01:19:16 mdb Exp $
|
||||||
|
|
||||||
package com.threerings.whirled.client;
|
package com.threerings.whirled.client;
|
||||||
|
|
||||||
@@ -127,12 +127,14 @@ public class SceneDirector
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// we need to call this both to mark that we're issuing a move
|
||||||
|
// request and to check to see if the last issued request should
|
||||||
|
// be considered stale
|
||||||
|
boolean refuse = _locdir.checkRepeatMove();
|
||||||
|
|
||||||
// complain if we're over-writing a pending request
|
// complain if we're over-writing a pending request
|
||||||
if (_pendingSceneId != -1) {
|
if (_pendingSceneId != -1) {
|
||||||
// if the pending request has been outstanding more than a
|
if (refuse) {
|
||||||
// minute, go ahead and let this new one through in an attempt
|
|
||||||
// to recover from dropped moveTo requests
|
|
||||||
if (_locdir.checkRepeatMove()) {
|
|
||||||
Log.warning("Refusing moveTo; We have a request outstanding " +
|
Log.warning("Refusing moveTo; We have a request outstanding " +
|
||||||
"[psid=" + _pendingSceneId +
|
"[psid=" + _pendingSceneId +
|
||||||
", nsid=" + sceneId + "].");
|
", nsid=" + sceneId + "].");
|
||||||
|
|||||||
Reference in New Issue
Block a user