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

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

Revision: 4824
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4824&view=rev
Author:   akirschbaum
Date:     2008-08-12 19:32:40 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Revert r4804 -- breaks pasting multi-tile objects.

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	2008-08-12 19:04:57 UTC (rev 4823)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2008-08-12 19:32:40 UTC (rev 4824)
@@ -212,7 +212,7 @@
     @Override
     public GameObject createMultiClone(final int posx, final int posy) {
         final GameObject newHead = createClone(posx, posy);
-        for (GameObject tmp = getMultiNext(); tmp != null; tmp = tmp.getMultiNext()) {
+        for (GameObject tmp = getArchetype().getMultiNext(); tmp != null; tmp = tmp.getMultiNext()) {
             newHead.addTailPart(tmp.createClone(posx + tmp.getMultiX(), posy + tmp.getMultiY()));
         }
         if (newHead.multi != null) {

Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java	2008-08-12 19:04:57 UTC (rev 4823)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java	2008-08-12 19:32:40 UTC (rev 4824)
@@ -362,7 +362,7 @@
     @Override
     public GameObject createMultiClone(final int posx, final int posy) {
         final GameObject newHead = createClone(posx, posy);
-        for (GameObject tmp = getMultiNext(); tmp != null; tmp = tmp.getMultiNext()) {
+        for (GameObject tmp = getArchetype().getMultiNext(); tmp != null; tmp = tmp.getMultiNext()) {
             newHead.addTailPart(tmp.createClone(posx + tmp.getMultiX(), posy + tmp.getMultiY()));
         }
 


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