Thread: [Gridarta-commit] SF.net SVN: gridarta: [821] trunk/crossfire (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 821
          http://svn.sourceforge.net/gridarta/?rev=821&view=rev
Author:   akirschbaum
Date:     2006-12-03 08:08:44 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Remove support for Iso-Tiles.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/IGUIConstants.java
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java

Removed Paths:
-------------
    trunk/crossfire/resource/system/igridtile.png
    trunk/crossfire/resource/system/inoarch.png
    trunk/crossfire/resource/system/inoface.png
    trunk/crossfire/resource/system/iseltile.png
    trunk/crossfire/resource/system/iunknown.png

Deleted: trunk/crossfire/resource/system/igridtile.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/inoarch.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/inoface.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/iseltile.png
===================================================================
(Binary files differ)

Deleted: trunk/crossfire/resource/system/iunknown.png
===================================================================
(Binary files differ)

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-03 15:56:25 UTC (rev 820)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-12-03 16:08:44 UTC (rev 821)
@@ -123,18 +123,8 @@
 
     private static ImageIcon nofaceTileIcon;
 
-    private static ImageIcon mapSelIconX;
-
-    private static ImageIcon mapGridIconX;
-
-    private static ImageIcon unknownTileIconX;
-
-    private static ImageIcon nofaceTileIconX;
-
     private static ImageIcon noarchTileIcon;
 
-    private static ImageIcon noarchTileIconX;
-
     private final ArchetypeSet archetypeSet; // the one and only arch list
 
     /** All open maps. */
@@ -1631,61 +1621,31 @@
     }
 
     public static ImageIcon getUnknownTileIcon() {
-        return unknownTileIconX;
+        return unknownTileIcon;
     }
 
-    public static ImageIcon getUnknownTileIconX() {
-        return unknownTileIconX;
-    }
-
     public static ImageIcon getNoarchTileIcon() {
-        return noarchTileIconX;
-    }
-
-    public static ImageIcon getNoarchTileIconF() {
         return noarchTileIcon;
     }
 
-    public static ImageIcon getNoarchTileIconX() {
-        return noarchTileIconX;
-    }
-
     public static ImageIcon getNofaceTileIcon() {
-        return nofaceTileIconX;
-    }
-
-    public static ImageIcon getNofaceTileIconF() {
         return nofaceTileIcon;
     }
 
-    public static ImageIcon getNofaceTileIconX() {
-        return nofaceTileIconX;
-    }
-
-    public static ImageIcon getMapSelIconF() {
+    public static ImageIcon getMapSelIcon() {
         return mapSelIcon;
     }
 
-    public static ImageIcon getMapSelIconX() {
-        return mapSelIconX;
-    }
-
     /**
      * Load all system tile icons into temporare variables for more convenient
      * access.
      */
     private static void loadDefTiles() {
-        mapGridIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IGRID_TILE);
-        mapSelIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_ISEL_TILE);
-        unknownTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IUNKNOWN);
-        nofaceTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_INOFACE);
-        noarchTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_INOARCH);
-
-        mapGridIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_GRID_TILE);
-        mapSelIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_SEL_TILE);
-        unknownTileIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_UNKNOWN);
-        nofaceTileIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOFACE);
-        noarchTileIconX = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOARCH);
+        mapGridIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_GRID_TILE);
+        mapSelIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_SEL_TILE);
+        unknownTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_UNKNOWN);
+        nofaceTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOFACE);
+        noarchTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_NOARCH);
     }
 
     public void handleErrors(final GridderException error) {
@@ -1732,7 +1692,7 @@
     }
 
     public static ImageIcon getEmptyTileIcon() {
-        return nofaceTileIconX;
+        return nofaceTileIcon;
     }
 
     public MapControl[] getOpenedMaps() {

Modified: trunk/crossfire/src/cfeditor/IGUIConstants.java
===================================================================
--- trunk/crossfire/src/cfeditor/IGUIConstants.java	2006-12-03 15:56:25 UTC (rev 820)
+++ trunk/crossfire/src/cfeditor/IGUIConstants.java	2006-12-03 16:08:44 UTC (rev 821)
@@ -233,16 +233,6 @@
     String EDIT_PLUGINS_SMALLICON = "EditPluginSmallIcon.gif";
 
     // tile icons from the system dir:
-    String TILE_IGRID_TILE = "igridtile.png";
-
-    String TILE_ISEL_TILE = "iseltile.png";
-
-    String TILE_IUNKNOWN = "iunknown.png";
-
-    String TILE_INOFACE = "inoface.png";
-
-    String TILE_INOARCH = "inoarch.png";
-
     String TILE_GRID_TILE = "gridtile.png";
 
     String TILE_SEL_TILE = "seltile.png";

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-03 15:56:25 UTC (rev 820)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-03 16:08:44 UTC (rev 821)
@@ -221,7 +221,7 @@
                     if (isPickmap) {
                         grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
                     } else {
-                        mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                        mainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                     }
                 } else {
                     for (final GameObject node : mapControl.getMapModel().getMapSquare(new Point(x, y))) {
@@ -231,12 +231,12 @@
                         }
                         if (mainControl.isTileEdit(node.getEditType()) || mainControl.getTileEdit() == 0 || isPickmap) {
                             if (node.getArchetypeName() == null) {
-                                mainControl.getNoarchTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                mainControl.getNoarchTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                             } else if (node.getFaceFlag()) {
-                                mainControl.getNofaceTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                mainControl.getNofaceTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                             } else {
                                 if (node.getFaceNr() == -1) {
-                                    mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                    mainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
                                 } else {
                                     // draw object face
                                     final ImageIcon img = archlist.getFace(node.getFaceNr());
@@ -322,7 +322,7 @@
                 grfx.setColor(IGUIConstants.BG_COLOR);
                 grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
             } else {
-                mainControl.getUnknownTileIconX().paintIcon(this, grfx, x * 32, y * 32);
+                mainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32, y * 32);
             }
         } else {
             tmpGrfx.fillRect(0, 0, 32, 32);
@@ -334,12 +334,12 @@
                 }
                 if (mainControl.isTileEdit(node.getEditType()) || mainControl.getTileEdit() == 0) {
                     if (node.getArchetypeName() == null) {
-                        mainControl.getNoarchTileIconX().paintIcon(this, tmpGrfx, 0, 0);
+                        mainControl.getNoarchTileIcon().paintIcon(this, tmpGrfx, 0, 0);
                     } else if (node.getFaceFlag()) {
-                        mainControl.getNofaceTileIconX().paintIcon(this, tmpGrfx, 0, 0);
+                        mainControl.getNofaceTileIcon().paintIcon(this, tmpGrfx, 0, 0);
                     } else {
                         if (node.getFaceNr() == -1) {
-                            mainControl.getUnknownTileIconX().paintIcon(this, tmpGrfx, 0, 0);
+                            mainControl.getUnknownTileIcon().paintIcon(this, tmpGrfx, 0, 0);
                         } else {
                             final ImageIcon img = archlist.getFace(node.getFaceNr());
                             if (!node.isMulti() || (img.getIconWidth() == 32 && img.getIconHeight() == 32)) {
@@ -410,7 +410,7 @@
 
             // Highlight the selected square
             if (x >= topx && x <= botx && y >= topy && y <= boty) {
-                mainControl.getMapSelIconX().paintIcon(this, grfx, x * 32, y * 32);
+                mainControl.getMapSelIcon().paintIcon(this, grfx, x * 32, y * 32);
             }
         }
     }
@@ -447,7 +447,7 @@
                 // Draw the Icon:
 
                 // Rectangular view
-                mainControl.getMapSelIconX().paintIcon(this, grfx, posx * 32 + borderOffset, posy * 32 + borderOffset);
+                mainControl.getMapSelIcon().paintIcon(this, grfx, posx * 32 + borderOffset, posy * 32 + borderOffset);
 
                 if (signY == 0) {
                     break;


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




Thread: [Gridarta-commit] SF.net SVN: gridarta: [821] trunk/crossfire (Page 2)

gridarta-commit