From b1a1dea224f5235cc28bedbed00f8506c3396c99 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sun, 24 Feb 2013 01:19:17 +0000 Subject: [PATCH] query tool: check bounds before attempting query git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@575 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/Micropolis.java | 2 +- src/micropolisj/gui/MainWindow.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java index 1117265..8140a81 100644 --- a/src/micropolisj/engine/Micropolis.java +++ b/src/micropolisj/engine/Micropolis.java @@ -431,7 +431,7 @@ public class Micropolis } } - final boolean testBounds(int xpos, int ypos) + final public boolean testBounds(int xpos, int ypos) { return xpos >= 0 && xpos < getWidth() && ypos >= 0 && ypos < getHeight(); diff --git a/src/micropolisj/gui/MainWindow.java b/src/micropolisj/gui/MainWindow.java index 4d74d34..93ba7b2 100644 --- a/src/micropolisj/gui/MainWindow.java +++ b/src/micropolisj/gui/MainWindow.java @@ -898,6 +898,9 @@ public class MainWindow extends JFrame void doQueryTool(int xpos, int ypos) { + if (!engine.testBounds(xpos, ypos)) + return; + ZoneStatus z = engine.queryZoneStatus(xpos, ypos); notificationPane.showZoneStatus(engine, xpos, ypos, z); }