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

Use the default base tileset when computing fringe if an actual base tile

Browse Source 
is not specified.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2444 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-04-22 20:36:11 +00:00
parent 1274fbb7c0
commit 76cb19646c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/tile/AutoFringer.java
+6 -9
View File
@@ -1,5 +1,5 @@
// //
// $Id: AutoFringer.java,v 1.20 2003/04/17 19:21:16 mdb Exp $ // $Id: AutoFringer.java,v 1.21 2003/04/22 20:36:11 mdb Exp $
package com.threerings.miso.tile; package com.threerings.miso.tile;
@@ -66,22 +66,19 @@ public class AutoFringer
_fringers.clear(); _fringers.clear();
// walk through our influence tiles // walk through our influence tiles
int maxy = row + 2, maxx = col + 2; for (int y = row - 1, maxy = row + 2; y < maxy; y++) {
for (int y = row - 1; y < maxy; y++) { for (int x = col - 1, maxx = col + 2; x < maxx; x++) {
for (int x = col - 1; x < maxx; x++) {
// we sensibly do not consider ourselves // we sensibly do not consider ourselves
if ((x == col) && (y == row)) { if ((x == col) && (y == row)) {
continue; continue;
} }
// make sure there's a tile at this position // determine the tileset for this tile
int btid = scene.getBaseTileId(x, y); int btid = scene.getBaseTileId(x, y);
if (btid == -1) { int baseset = (btid <= 0) ?
continue; scene.getDefaultBaseTileSet() : (btid >> 16);
}
// determine if it fringes on our tile // determine if it fringes on our tile
int baseset = btid >> 16;
int pri = _fringeconf.fringesOn(baseset, underset); int pri = _fringeconf.fringesOn(baseset, underset);
if (pri == -1) { if (pri == -1) {
continue; continue;