altoslib: Make AltosMap floor/ceil static. Check transform in paint

[fw/altos] / altoslib / AltosMap.java

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index d68cff7a6f99028791c1225336a6a8f7a2fae66a..2c93adb8d008bcfbb355a418a39d265ae41eb570 100644 (file)
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -113,12 +113,12 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                map_interface.debug(format, arguments);
        }
 
-       public AltosPointInt floor(AltosPointDouble point) {
+       static public AltosPointInt floor(AltosPointDouble point) {
                return new AltosPointInt ((int) Math.floor(point.x / AltosMap.px_size) * AltosMap.px_size,
                                              (int) Math.floor(point.y / AltosMap.px_size) * AltosMap.px_size);
        }
 
-       public AltosPointInt ceil(AltosPointDouble point) {
+       static public AltosPointInt ceil(AltosPointDouble point) {
                return new AltosPointInt ((int) Math.ceil(point.x / AltosMap.px_size) * AltosMap.px_size,
                                              (int) Math.ceil(point.y / AltosMap.px_size) * AltosMap.px_size);
        }
@@ -357,6 +357,9 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                if (centre != null)
                        make_tiles();
 
+               if (transform == null)
+                       return;
+
                for (AltosMapTile tile : tiles.values())
                        tile.paint(transform);