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

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

Revision: 1486
          http://svn.sourceforge.net/gridarta/?rev=1486&view=rev
Author:   akirschbaum
Date:     2007-01-07 04:40:23 -0800 (Sun, 07 Jan 2007)

Log Message:
-----------
Fix #1613729 (Monsters appear as "weak wall (0)").

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
    trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2007-01-07 12:24:14 UTC (rev 1485)
+++ trunk/crossfire/ChangeLog	2007-01-07 12:40:23 UTC (rev 1486)
@@ -1,5 +1,8 @@
 2007-01-07  Andreas Kirschbaum
 
+	* Fix #1613729 (Monsters appear as "weak wall (0)"). (Previous fix
+	did miss the game object attributes panel.)
+
 	* Fix #1497857 (Creating a new Script for unsaved map throws NPE).
 
 2007-01-06  Andreas Kirschbaum

Modified: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java	2007-01-07 12:24:14 UTC (rev 1485)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java	2007-01-07 12:40:23 UTC (rev 1486)
@@ -60,6 +60,7 @@
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
+import net.sf.gridarta.CFArchType;
 import net.sf.gridarta.gui.GSplitPane;
 import net.sf.gridarta.gui.connectionview.ConnectionControl;
 import net.sf.japi.swing.ActionFactory;
@@ -752,7 +753,8 @@
 
         final StringBuilder typeText = new StringBuilder();
         if (archetype != null) {
-            typeText.append("Type: ").append(mainControl.getTypeList().getArchTypeName(gameObject.getArchTypNr())).append(" (").append(gameObject.getArchTypNr()).append(") [").append(gameObject.getArchetypeName()).append(']');
+            final CFArchType archType = mainControl.getTypeList().getType(gameObject);
+            typeText.append("Type: ").append(archType.getTypeName()).append(" (").append(archType.getTypeNr()).append(") [").append(gameObject.getArchetypeName()).append(']');
         } else {
             typeText.append("Type: <unknown>");
         }

Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java	2007-01-07 12:24:14 UTC (rev 1485)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java	2007-01-07 12:40:23 UTC (rev 1486)
@@ -62,6 +62,7 @@
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
+import net.sf.gridarta.CFArchType;
 import net.sf.gridarta.gui.GSplitPane;
 import net.sf.gridarta.gui.connectionview.ConnectionControl;
 import net.sf.japi.swing.ActionFactory;
@@ -875,7 +876,8 @@
 
         final StringBuilder typeText = new StringBuilder();
         if (archetype != null) {
-            typeText.append("Type: ").append(mainControl.getTypeList().getArchTypeName(gameObject.getArchTypNr())).append(" (").append(gameObject.getArchTypNr()).append(") [").append(gameObject.getArchetypeName()).append(']');
+            final CFArchType archType = mainControl.getTypeList().getType(gameObject);
+            typeText.append("Type: ").append(archType.getTypeName()).append(" (").append(archType.getTypeNr()).append(") [").append(gameObject.getArchetypeName()).append(']');
         } else {
             typeText.append("Type: <unknown>");
         }


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