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

NoLongerAnySuchNoSuchTileException. Instead we just log a warning and

Browse Source 
return a tile with an error image so that the caller doesn't freak out and
we achieve maximal "continue to work as much as possible."


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3177 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-10-28 17:49:02 +00:00
parent 69e3f857c2
commit a70efc3ffb
10 changed files with 52 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/client/SceneBlock.java
+1 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneBlock.java,v 1.25 2004/08/27 02:20:06 mdb Exp $
// $Id: SceneBlock.java,v 1.26 2004/10/28 17:49:02 mdb Exp $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -33,7 +33,6 @@ import com.samskivert.util.HashIntMap;
import com.samskivert.util.StringUtil;
import com.threerings.geom.GeomUtil;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.TileSet;
@@ -301,8 +300,6 @@ public class SceneBlock
errmsg = "Scene contains non-base tile in base layer";
} catch (NoSuchTileSetException nste) {
errmsg = "Scene contains non-existent tileset";
} catch (NoSuchTileException nste) {
errmsg = "Scene contains non-existent tile";
}
if (errmsg != null) {
src/java/com/threerings/miso/client/SceneObject.java
+1 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneObject.java,v 1.11 2004/08/27 02:20:06 mdb Exp $
// $Id: SceneObject.java,v 1.12 2004/10/28 17:49:02 mdb Exp $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -32,7 +32,6 @@ import java.awt.Rectangle;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.TileUtil;
@@ -256,9 +255,6 @@ public class SceneObject
tsid, tidx, panel.getColorizer(info));
computeInfo(panel.getSceneMetrics());
} catch (NoSuchTileException nste) {
Log.warning("Scene contains non-existent object tile " +
"[info=" + info + "].");
} catch (NoSuchTileSetException te) {
Log.warning("Scene contains non-existent object tileset " +
"[info=" + info + "].");
src/java/com/threerings/miso/tile/AutoFringer.java
+2 -6
View File
@@ -1,5 +1,5 @@
//
// $Id: AutoFringer.java,v 1.29 2004/08/27 02:20:07 mdb Exp $
// $Id: AutoFringer.java,v 1.30 2004/10/28 17:49:02 mdb Exp $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -34,7 +34,6 @@ import com.threerings.media.image.BufferedMirage;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileManager;
@@ -157,9 +156,6 @@ public class AutoFringer
try {
ftimg = getTileImage(ftimg, fringers[ii].baseset,
indexes[jj], masks, hashValue);
} catch (NoSuchTileException nste) {
Log.warning("Autofringer couldn't find a needed tile " +
"[error=" + nste + "].");
} catch (NoSuchTileSetException nstse) {
Log.warning("Autofringer couldn't find a needed tileset " +
"[error=" + nstse + "].");
@@ -176,7 +172,7 @@ public class AutoFringer
protected BufferedImage getTileImage (
BufferedImage ftimg, int baseset, int index,
HashMap masks, int hashValue)
throws NoSuchTileException, NoSuchTileSetException
throws NoSuchTileSetException
{
FringeConfiguration.FringeTileSetRecord tsr =
_fringeconf.getFringe(baseset, hashValue);