[Gridarta-commit] SF.net SVN: gridarta: [1440] trunk

[<aki...@us...>]

Revision: 1440
          http://svn.sourceforge.net/gridarta/?rev=1440&view=rev
Author:   akirschbaum
Date:     2007-01-04 23:21:46 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Unify code.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/GameObject.java
    trunk/daimonin/src/daieditor/gameobject/GameObject.java

Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2007-01-05 01:37:30 UTC (rev 1439)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2007-01-05 07:21:46 UTC (rev 1440)
@@ -534,8 +534,6 @@
         clone.setMapX(posx);
         clone.setMapY(posy);
 
-        // If 'this' arch is a container, we have to create clones
-        // of the whole inventory (recursively) and link them in:
         for (final GameObject invItem : inv) {
             clone.addLast(invItem.createClone(posx, posy));
         }

Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java	2007-01-05 01:37:30 UTC (rev 1439)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java	2007-01-05 07:21:46 UTC (rev 1440)
@@ -552,8 +552,9 @@
         clone.script = new ScriptArchData(clone); // Script data
         clone.setMapX(posx);
         clone.setMapY(posy);
-        for (final GameObject tmp : this) { // Inventory
-            clone.addLast(tmp.createClone(-1, -1));
+
+        for (final GameObject invItem : this) { // Inventory
+            clone.addLast(invItem.createClone(-1, -1));
         }
 
         return clone;


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