[Gridarta-commit] SF.net SVN: gridarta: [1441] trunk/crossfire

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

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

Log Message:
-----------
Retain inventory when copying game objects.

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

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2007-01-05 07:21:46 UTC (rev 1440)
+++ trunk/crossfire/ChangeLog	2007-01-05 07:35:59 UTC (rev 1441)
@@ -1,3 +1,7 @@
+2007-01-05  Andreas Kirschbaum
+
+	* Retain inventory when copying game objects.
+
 2006-12-24  Andreas Kirschbaum
 
 	* Update archetypes.

Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2007-01-05 07:21:46 UTC (rev 1440)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2007-01-05 07:35:59 UTC (rev 1441)
@@ -73,12 +73,6 @@
     private boolean editflag;            // if true, object is in a editor
 
     /**
-     * All inventory objects. Set to {@link Collections#EMPTY_LIST}
-     * (to save space) if the object has no inventory.
-     */
-    private List<GameObject> inv = Collections.EMPTY_LIST;
-
-    /**
      * Object type.
      */
     private int archType;
@@ -534,7 +528,7 @@
         clone.setMapX(posx);
         clone.setMapY(posy);
 
-        for (final GameObject invItem : inv) {
+        for (final GameObject invItem : this) {
             clone.addLast(invItem.createClone(posx, posy));
         }
 


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