[Rails-commits] SF.net SVN: rails:[1464] trunk/18xx

[<ev...@us...>]

Revision: 1464
          http://rails.svn.sourceforge.net/rails/?rev=1464&view=rev
Author:   evos
Date:     2010-12-24 18:59:23 +0000 (Fri, 24 Dec 2010)

Log Message:
-----------
Implemented usage of <TileSet><Tile> pictureID attribute.
In 18EU this causes the correct tiles (internally numbered 3081-3083) to be displayed.
These tiles have also been replaced, as the original SVG images (from JA Tamplin) had a different orientation.

Modified Paths:
--------------
    trunk/18xx/rails/ui/swing/hexmap/GUITile.java
    trunk/18xx/tiles/TileDictionary.18t
    trunk/18xx/tiles/svg/tile3081.svg
    trunk/18xx/tiles/svg/tile3082.svg
    trunk/18xx/tiles/svg/tile3083.svg

Modified: trunk/18xx/rails/ui/swing/hexmap/GUITile.java
===================================================================
--- trunk/18xx/rails/ui/swing/hexmap/GUITile.java	2010-12-22 20:56:50 UTC (rev 1463)
+++ trunk/18xx/rails/ui/swing/hexmap/GUITile.java	2010-12-24 18:59:23 UTC (rev 1464)
@@ -24,6 +24,7 @@
     protected TileI tile = null;
     protected String tileType = null;
 
+    protected int picId;
     protected BufferedImage tileImage = null;
 
     protected int rotation = 0;
@@ -53,6 +54,7 @@
         this.hex = (MapHex)guiHex.getModel();
         TileManager tileManager = guiHex.getHexMap().orUIManager.getTileManager();
         tile = tileManager.getTile(tileId);
+        picId = tile.getPictureId();
 
         if (hex.getTileOrientation() == MapHex.EW) {
             baseRotation = 0.5 * DEG60;
@@ -250,7 +252,7 @@
 
         int zoomStep = guiHex.getHexMap().getZoomStep();
 
-        tileImage = imageLoader.getTile(tileId, zoomStep);
+        tileImage = imageLoader.getTile(picId, zoomStep);
 
         if (tileImage != null) {
 

Modified: trunk/18xx/tiles/TileDictionary.18t
===================================================================
(Binary files differ)

Modified: trunk/18xx/tiles/svg/tile3081.svg
===================================================================
(Binary files differ)

Modified: trunk/18xx/tiles/svg/tile3082.svg
===================================================================
(Binary files differ)

Modified: trunk/18xx/tiles/svg/tile3083.svg
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.