From ecba1ff5f99573418a2d3cac05c0643e9615905c Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Mon, 12 Aug 2013 02:24:03 +0000 Subject: [PATCH] tiles.rc: control airport radar animation through tiles.rc instead of in the java code git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@791 d9718cc8-9f43-0410-858b-315f434eb58c --- graphics/tiles.rc | 18 +++++++++--------- src/micropolisj/engine/MapScanner.java | 13 ------------- src/micropolisj/engine/TileConstants.java | 1 - 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/graphics/tiles.rc b/graphics/tiles.rc index 2d05864..a6d2b2a 100644 --- a/graphics/tiles.rc +++ b/graphics/tiles.rc @@ -724,7 +724,7 @@ # BEGIN AIRPORT # 709 airport@0,0 (conducts) 710 airport@16,0 (conducts) -711 airport@32,0 (conducts) +711 airport@32,0 (conducts)(onpower=832) 712 airport@48,0 (conducts) 713 airport@64,0 (conducts) 714 airport@80,0 (conducts) @@ -853,14 +853,14 @@ 830 misc_animation@0,48 (noburn) 831 misc_animation@0,64 (noburn) # BEGIN RADAR DISH # -832 misc_animation@0,80 (conducts) (becomes=833) -833 misc_animation@0,96 (conducts) (becomes=834) -834 misc_animation@0,112 (conducts) (becomes=835) -835 misc_animation@0,128 (conducts) (becomes=836) -836 misc_animation@0,144 (conducts) (becomes=837) -837 misc_animation@0,160 (conducts) (becomes=838) -838 misc_animation@0,176 (conducts) (becomes=839) -839 misc_animation@0,192 (conducts) (becomes=832) +832 misc_animation@0,80 (conducts) (becomes=833)(onshutdown=711) +833 misc_animation@0,96 (conducts) (becomes=834)(onshutdown=711) +834 misc_animation@0,112 (conducts) (becomes=835)(onshutdown=711) +835 misc_animation@0,128 (conducts) (becomes=836)(onshutdown=711) +836 misc_animation@0,144 (conducts) (becomes=837)(onshutdown=711) +837 misc_animation@0,160 (conducts) (becomes=838)(onshutdown=711) +838 misc_animation@0,176 (conducts) (becomes=839)(onshutdown=711) +839 misc_animation@0,192 (conducts) (becomes=832)(onshutdown=711) # BEGIN FOUNTAIN / FLAG # 840 misc_animation@0,208 (becomes=841) 841 misc_animation@0,224 (becomes=842) diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java index 1e89cd4..820921f 100644 --- a/src/micropolisj/engine/MapScanner.java +++ b/src/micropolisj/engine/MapScanner.java @@ -627,19 +627,6 @@ class MapScanner repairZone(AIRPORT, 6); } - if (powerOn) - { - if ((city.map[ypos-1][xpos+1] & LOMASK) == RADAR) { - city.setTile(xpos+1,ypos-1, (char) - (RADAR_ANIM) - ); - } - } - else - { - city.setTile(xpos+1,ypos-1,(char)(RADAR)); - } - if (powerOn) { doAirport(); } diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index 74a1da7..599b76b 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -144,7 +144,6 @@ public class TileConstants public static final char PORT = 698; public static final char LASTPORT = 708; public static final char AIRPORTBASE = 709; - public static final char RADAR = 711; public static final char AIRPORT = 716; public static final char COALBASE = 745; public static final char POWERPLANT = 750;