Engine: Imposed text color limit

Previously, if the client provided a message escape with an invalid color number (a.k.a. it wasn't between 0 and 19) FourPuzzle would crash with a confusing error message. This has been replaced with a more helpful message.

Also, previously, the colors between 10 and 19 could not be accessed, but this has been fixed.

1 files changed, 4 insertions, 1 deletions

@@ -74,8 +74,11 @@ public class SystemGraphic {
         if (color < 10)
         {
             return systemGraphic.getSubimage(color*16, 48, 16, 16);
+        } else if (color < 20)
+        {
+            return systemGraphic.getSubimage((color-10)*16, 64, 16, 16);
         } else {
-            return systemGraphic.getSubimage(color*16, 64, 16, 16);
+            throw new IllegalArgumentException("Color must be in the range of 0 to 19");
         }
     }