Merge branch 'core'

lordrio · Jul 31, 2014 · 80a6b90 · 80a6b90
2 parents 926e03b + 5a13ca8
commit 80a6b90
Show file tree

Hide file tree

Showing 34 changed files with 1,596 additions and 1,092 deletions.
diff --git a/lib/jogl-natives/gluegen-rt-natives-linux-amd64.jar b/lib/jogl-natives/gluegen-rt-natives-linux-amd64.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-linux-armv6.jar b/lib/jogl-natives/gluegen-rt-natives-linux-armv6.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-linux-armv6hf.jar b/lib/jogl-natives/gluegen-rt-natives-linux-armv6hf.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-linux-i586.jar b/lib/jogl-natives/gluegen-rt-natives-linux-i586.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-macosx-universal.jar b/lib/jogl-natives/gluegen-rt-natives-macosx-universal.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-solaris-amd64.jar b/lib/jogl-natives/gluegen-rt-natives-solaris-amd64.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-solaris-i586.jar b/lib/jogl-natives/gluegen-rt-natives-solaris-i586.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-windows-amd64.jar b/lib/jogl-natives/gluegen-rt-natives-windows-amd64.jar
diff --git a/lib/jogl-natives/gluegen-rt-natives-windows-i586.jar b/lib/jogl-natives/gluegen-rt-natives-windows-i586.jar
diff --git a/lib/jogl-natives/jogl-natives-linux-amd64.jar b/lib/jogl-natives/jogl-natives-linux-amd64.jar
diff --git a/lib/jogl-natives/jogl-natives-linux-armv6.jar b/lib/jogl-natives/jogl-natives-linux-armv6.jar
diff --git a/lib/jogl-natives/jogl-natives-linux-armv6hf.jar b/lib/jogl-natives/jogl-natives-linux-armv6hf.jar
diff --git a/lib/jogl-natives/jogl-natives-linux-i586.jar b/lib/jogl-natives/jogl-natives-linux-i586.jar
diff --git a/lib/jogl-natives/jogl-natives-macosx-universal.jar b/lib/jogl-natives/jogl-natives-macosx-universal.jar
diff --git a/lib/jogl-natives/jogl-natives-solaris-amd64.jar b/lib/jogl-natives/jogl-natives-solaris-amd64.jar
diff --git a/lib/jogl-natives/jogl-natives-solaris-i586.jar b/lib/jogl-natives/jogl-natives-solaris-i586.jar
diff --git a/lib/jogl-natives/jogl-natives-windows-amd64.jar b/lib/jogl-natives/jogl-natives-windows-amd64.jar
diff --git a/lib/jogl-natives/jogl-natives-windows-i586.jar b/lib/jogl-natives/jogl-natives-windows-i586.jar
diff --git a/src/haven/GLState.java b/src/haven/GLState.java
@@ -745,6 +745,10 @@ public void prep(Buffer buf) {
 	    for(GLState st : states)
 		st.prep(buf);
 	}
+
+	public String toString() {
+	    return("composed(" + Arrays.asList(states) + ")");
+	}
     }
 
     public static GLState compose(GLState... states) {

diff --git a/src/haven/IDSet.java b/src/haven/IDSet.java
@@ -74,4 +74,10 @@ public T intern(T ob) {
 	    }
 	}
     }
+
+    public int size() {
+	synchronized(bk) {
+	    return(bk.size());
+	}
+    }
 }
diff --git a/src/haven/LocalMiniMap.java b/src/haven/LocalMiniMap.java
@@ -32,7 +32,7 @@
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
 import java.util.*;
-import haven.resutil.RidgeTile;
+import haven.resutil.Ridges;
 
 public class LocalMiniMap extends Widget {
     public final MapView mv;
@@ -98,8 +98,8 @@ public BufferedImage drawmap(Coord ul, Coord sz) {
 	    for(c.x = 1; c.x < sz.x - 1; c.x++) {
 		int t = m.gettile(ul.add(c));
 		Tiler tl = m.tiler(t);
-		if(tl instanceof RidgeTile) {
-		    if(((RidgeTile)tl).ridgep(m, ul.add(c))) {
+		if(tl instanceof Ridges.RidgeTile) {
+		    if(Ridges.brokenp(m, ul.add(c))) {
 			for(int y = c.y; y <= c.y + 1; y++) {
 			    for(int x = c.x; x <= c.x + 1; x++) {
 				int rgb = buf.getRGB(x, y);