[Gridarta-commit] SF.net SVN: gridarta: [1124] trunk/crossfire/src/cfeditor/gui/map/ DefaultLevelRenderer.java

[<der...@us...>]

Revision: 1124
          http://svn.sourceforge.net/gridarta/?rev=1124&view=rev
Author:   derdanny
Date:     2006-12-17 02:21:59 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
Replaced x,y-pair with Point.

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

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-17 00:53:47 UTC (rev 1123)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-17 10:21:59 UTC (rev 1124)
@@ -246,35 +246,36 @@
         // this vector contains all heads of multi-tiles with oversized images
         final Vector<GameObject> oversizedMultiHeads = new Vector<GameObject>();
         final CFilterControl filter = mainControl.getFilterControl();
-        for (int y = 0; y < mapGrid.getSize().getHeight(); y++) {
-            for (int x = 0; x < mapGrid.getSize().getWidth(); x++) {
+        final Point point = new Point();
+        for (point.y = 0; point.y < mapGrid.getSize().getHeight(); point.y++) {
+            for (point.x = 0; point.x < mapGrid.getSize().getWidth(); point.x++) {
                 filter.newSquare();
-                if (!mapControl.getMapModel().containsArchObject(new Point(x, y))) {
+                if (!mapControl.getMapModel().containsArchObject(point)) {
                     // empty square
                     if (isPickmap) {
-                        grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
+                        grfx.fillRect(point.x * 32 + borderOffset, point.y * 32 + borderOffset, 32, 32);
                     } else {
-                        CMainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                        CMainControl.getUnknownTileIcon().paintIcon(this, grfx, point.x * 32 + borderOffset, point.y * 32 + borderOffset);
                     }
                 } else {
-                    for (final GameObject node : mapControl.getMapModel().getMapSquare(new Point(x, y))) {
+                    for (final GameObject node : mapControl.getMapModel().getMapSquare(point)) {
                         filter.objectInSquare(node);
                         if (!filter.canShow(node)) {
                             continue;
                         }
                         if (mainControl.isTileEdit(node.getEditType()) || mainControl.getTileEdit() == 0 || isPickmap) {
                             if (node.getArchetypeName() == null) {
-                                CMainControl.getNoarchTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                CMainControl.getNoarchTileIcon().paintIcon(this, grfx, point.x * 32 + borderOffset, point.y * 32 + borderOffset);
                             } else if (node.getFaceFlag()) {
-                                CMainControl.getNofaceTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                CMainControl.getNofaceTileIcon().paintIcon(this, grfx, point.x * 32 + borderOffset, point.y * 32 + borderOffset);
                             } else {
                                 if (node.getFaceNr() == -1) {
-                                    CMainControl.getUnknownTileIcon().paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                    CMainControl.getUnknownTileIcon().paintIcon(this, grfx, point.x * 32 + borderOffset, point.y * 32 + borderOffset);
                                 } else {
                                     // draw object face
                                     final ImageIcon img = archlist.getFace(node.getFaceNr());
                                     if (!node.isMulti() || (img.getIconWidth() == 32 && img.getIconHeight() == 32)) {
-                                        archlist.getFace(node.getFaceNr()).paintIcon(this, grfx, x * 32 + borderOffset, y * 32 + borderOffset);
+                                        archlist.getFace(node.getFaceNr()).paintIcon(this, grfx, point.x * 32 + borderOffset, point.y * 32 + borderOffset);
                                     } else if (node.isHead()) {
                                         oversizedMultiHeads.addElement(node); // store oversized arches for later
                                     }
@@ -290,7 +291,7 @@
                     final Color alpha = highLightMask[i];
                     final Color c = grfx.getColor();
                     grfx.setColor(alpha);
-                    grfx.fillRect(x * 32 + borderOffset, y * 32 + borderOffset, 32, 32);
+                    grfx.fillRect(point.x * 32 + borderOffset, point.y * 32 + borderOffset, 32, 32);
                     grfx.setColor(c);
                 }
             }


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