AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't allow scene resolution to continue if the updates couldn't load.

Browse Source 
They *are* just updates, but if it's ok for them to not load then a
game-specific scene repository needs to make that decision and just
return a blank update list rather than throwing an exception.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@68 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Ray Greenwell
2006-09-01 21:07:27 +00:00
parent b1ae928811
commit 8703f5b0a8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/server/SceneRegistry.java
+3 -3
View File
@@ -211,10 +211,10 @@ public class SceneRegistry
// this is run on the dobjmgr thread // this is run on the dobjmgr thread
public void handleResult () public void handleResult ()
{ {
if (_model != null) { if (_cause != null) {
processSuccessfulResolution(_model, _updates);
} else if (_cause != null) {
processFailedResolution(fsceneId, _cause); processFailedResolution(fsceneId, _cause);
} else if (_model != null) {
processSuccessfulResolution(_model, _updates);
} else { } else {
Log.warning("Scene loading unit finished with " + Log.warning("Scene loading unit finished with " +
"neither a scene nor a reason for " + "neither a scene nor a reason for " +