Mercurial > sumwars

changeset 2703:7fc84572b43c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refs #105: Fixes coverity issue 1197035
author Augustin Preda
date Thu, 10 Apr 2014 20:40:16 +0300
parents 2d2674a79a21
children 613735ae7bdf
files src/gui/contenteditor/itemeditor.cpp
diffstat 1 files changed, 298 insertions(+), 176 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui/contenteditor/itemeditor.cpp	Thu Apr 10 20:06:52 2014 +0300
+++ b/src/gui/contenteditor/itemeditor.cpp	Thu Apr 10 20:40:16 2014 +0300
@@ -13,6 +13,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+//
+// Includes
+//
+
+//
+// Own header
+//
+#include "itemeditor.h"
+
+//
+// C++ system headers.
+//
+
+#include <map>
+#include <string>
+
 // Utility for CEGUI cross-version compatibility
 #include "ceguiutility.h"
 
@@ -26,7 +42,6 @@
 #include <OgreMeshManager.h>
 
 #include "graphicmanager.h"
-#include "itemeditor.h"
 #include "renderinfoeditor.h"
 #include "contenteditor.h"
 #include "player.h"
@@ -38,37 +53,49 @@
 	
 	CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton();
 	
-  CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/SubmitButton"));
+  CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/SubmitButton"));
 	xmlsubmitButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ItemEditor::onItemXMLModified, this));
 	
-	CEGUI::PushButton* createDropButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/Create/CreateDropButton"));
+	CEGUI::PushButton* createDropButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/Create/CreateDropButton"));
 	createDropButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ItemEditor::onItemCreateDrop, this));
 	
-	CEGUI::PushButton* createInvButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/Create/CreateInventoryButton"));
+	CEGUI::PushButton* createInvButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/Create/CreateInventoryButton"));
 	createInvButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ItemEditor::onItemCreateInInventory, this));
 	
-	CEGUI::Spinner* enchantMin =  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/EnchantMinSpinner"));
+	CEGUI::Spinner* enchantMin =  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/EnchantMinSpinner"));
 	enchantMin->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this));
 	
-	CEGUI::Spinner* enchantMax =  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/EnchantMaxSpinner"));
+	CEGUI::Spinner* enchantMax =  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/EnchantMaxSpinner"));
 	enchantMax->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this));
 	
-	CEGUI::Spinner* price =  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/PriceSpinner"));
+	CEGUI::Spinner* price =  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/PriceSpinner"));
 	price->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this));
 	
-	CEGUI::Editbox* nameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/NameBox"));
+	CEGUI::Editbox* nameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/NameBox"));
 	nameBox->subscribeEvent(CEGUI::Editbox::EventTextChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this));
-	
-	CEGUI::Combobox* typeSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-    "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox"));
-	typeSelector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this));
+
+	CEGUI::Combobox* typeSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox"));
+
+	typeSelector->subscribeEvent(
+      CEGUI::Combobox::EventListSelectionAccepted, 
+      CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this));
+
 	typeSelector->addItem(new CEGUI::ListboxTextItem("Armor"));
 	typeSelector->addItem(new CEGUI::ListboxTextItem("Weapon"));
 	typeSelector->addItem(new CEGUI::ListboxTextItem("Helmet"));
@@ -78,7 +105,7 @@
 	typeSelector->addItem(new CEGUI::ListboxTextItem("Shield"));
 	typeSelector->addItem(new CEGUI::ListboxTextItem("Potion"));
 	typeSelector->setText("Armor");
-	typeSelector->setSelection(0,0);
+	typeSelector->setSelection(0, 0);
 	
 	
 	CEGUI::Combobox* sizeSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
@@ -88,7 +115,7 @@
 	sizeSelector->addItem(new CEGUI::ListboxTextItem("Medium"));
 	sizeSelector->addItem(new CEGUI::ListboxTextItem("Small"));
 	sizeSelector->setText("Big");
-	sizeSelector->setSelection(0,0);
+	sizeSelector->setSelection(0, 0);
 	
 	CEGUI::PushButton* copyfoButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
     "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/CopyDataButton"));
@@ -175,125 +202,130 @@
 	// Wire the consume tab
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/HealthSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/HealthSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedSpinner"))->subscribeEvent(
       CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this));
 	
 	// wire the equip tab
 	static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner"))->subscribeEvent(
+          CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
+	
+  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
+      m_rootWindow,
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner"))->subscribeEvent(
           CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner"))-> subscribeEvent(
-          CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner"))->subscribeEvent(
+      CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner"))->subscribeEvent(
       CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner"))->subscribeEvent(
       CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner"))->subscribeEvent(
       CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner"))->subscribeEvent(
       CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner"))->subscribeEvent(
       CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
   static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
       m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner"))-> subscribeEvent(
-      CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
-	
-  static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(
-      m_rootWindow,
-      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner"))-> subscribeEvent(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner"))->subscribeEvent(
       CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this));
 	
 	
 	// init the internal data
+  TiXmlNode* linkedNode = NULL;
 	TiXmlElement * item_root = new TiXmlElement("Item");  
-	m_item_xml.LinkEndChild( item_root );  
-	item_root->SetAttribute("subtype","EditorItem");
+	linkedNode = m_item_xml.LinkEndChild(item_root);  
+  if (linkedNode != NULL)
+  {
+    // Only use item_root if it was not deleted.
+	  item_root->SetAttribute("subtype", "EditorItem");
+  }
 	
 	TiXmlElement * item_image = new TiXmlElement("Image");  
-	item_image->SetAttribute("image","noMedia.png"); // previously: "set:noMedia.png image:full_image"
+	item_image->SetAttribute("image", "noMedia.png"); // previously: "set:noMedia.png image:full_image"
 	item_root->LinkEndChild(item_image);
 	
 	TiXmlElement * item_ri = new TiXmlElement("RenderInfo");  
-	item_ri->SetAttribute("name","EditorRenderInfo");
+	item_ri->SetAttribute("name", "EditorRenderInfo");
 	item_root->LinkEndChild(item_ri);
 	
 	// init the data
@@ -307,8 +339,8 @@
 	Ogre::Camera* item_camera = editor_scene_mng->createCamera("item_camera");
 	item_camera->setNearClipDistance(0.1);
 	item_camera->setAspectRatio(1.0);
-	item_camera->setPosition(Ogre::Vector3(0,1,0));
-	item_camera->lookAt(Ogre::Vector3(0,0,0));
+	item_camera->setPosition(Ogre::Vector3(0, 1, 0));
+	item_camera->lookAt(Ogre::Vector3(0, 0, 0));
 	
 	m_unique_id = 1;
 
@@ -346,8 +378,8 @@
           "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/CopyDataBox"));
 	
 	// Fill list of all FixedObjects
-	const std::map<Item::Subtype,ItemBasicData*>& all_items = ItemFactory::getAllItemData();
-	std::map<Item::Subtype,ItemBasicData*>::const_iterator it;
+	const std::map<Item::Subtype, ItemBasicData*>& all_items = ItemFactory::getAllItemData();
+	std::map<Item::Subtype, ItemBasicData*>::const_iterator it;
 	for (it = all_items.begin(); it != all_items.end(); ++it)
 	{
 		copyItemSelector->addItem(new CEGUI::ListboxTextItem(it->first.c_str()));
@@ -378,26 +410,63 @@
 	if (m_edited_item.m_max_enchant < m_edited_item.m_min_enchant)
 	{
 		m_edited_item.m_max_enchant = m_edited_item.m_min_enchant;
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxSpinner",m_edited_item.m_max_enchant);
+		setSpinnerValue(
+        "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxSpinner", 
+        m_edited_item.m_max_enchant);
 	}
-	m_edited_item.m_name = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/NameBox","EditorItem");
+	m_edited_item.m_name = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/NameBox", "EditorItem");
 	
-	std::string type = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox","Weapon");
+	std::string type = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Weapon");
 	m_edited_item.m_type = Item::WEAPON;
-	if (type == "Armor") m_edited_item.m_type = Item::ARMOR;
-	else if (type == "Weapon") m_edited_item.m_type = Item::WEAPON;
-	else if (type == "Helmet") m_edited_item.m_type = Item::HELMET;
-	else if (type == "Gloves") m_edited_item.m_type = Item::GLOVES;
-	else if (type == "Ring") m_edited_item.m_type = Item::RING;
-	else if (type == "Amulet") m_edited_item.m_type = Item::AMULET;
-	else if (type == "Shield") m_edited_item.m_type = Item::SHIELD;
-	else if (type == "Potion") m_edited_item.m_type = Item::POTION;
+	if (type == "Armor") 
+  {
+    m_edited_item.m_type = Item::ARMOR;
+  }
+	else if (type == "Weapon")
+  {
+    m_edited_item.m_type = Item::WEAPON;
+  }
+	else if (type == "Helmet")
+  {
+    m_edited_item.m_type = Item::HELMET;
+  }
+	else if (type == "Gloves")
+  {
+    m_edited_item.m_type = Item::GLOVES;
+  }
+	else if (type == "Ring")
+  {
+    m_edited_item.m_type = Item::RING;
+  }
+	else if (type == "Amulet")
+  {
+    m_edited_item.m_type = Item::AMULET;
+  }
+	else if (type == "Shield")
+  {
+    m_edited_item.m_type = Item::SHIELD;
+  }
+	else if (type == "Potion")
+  {
+    m_edited_item.m_type = Item::POTION;
+  }
 
-	std::string size = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/SizeBox","Big");
+	std::string size = getWindowText(
+      "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/SizeBox", "Big");
+
 	m_edited_item.m_size = Item::BIG;
-	if (size == "Big") m_edited_item.m_size = Item::BIG;
-	else if (size == "Medium") m_edited_item.m_size = Item::MEDIUM;
-	else if (size == "Small") m_edited_item.m_size = Item::SMALL;
+	if (size == "Big")
+  {
+    m_edited_item.m_size = Item::BIG;
+  }
+	else if (size == "Medium")
+  {
+    m_edited_item.m_size = Item::MEDIUM;
+  }
+	else if (size == "Small")
+  {
+    m_edited_item.m_size = Item::SMALL;
+  }
 
 	m_no_cegui_events = false;
 	m_modified_item = true;
@@ -408,7 +477,10 @@
 bool ItemEditor::onWeaponModified(const CEGUI::EventArgs& evt)
 {
 	if (m_no_cegui_events)
+  {
 		return true;
+  }
+
 	m_no_cegui_events = true;
 	
 	if (m_edited_item.m_weapon_attr == 0)
@@ -416,49 +488,49 @@
 		m_edited_item.m_weapon_attr = new WeaponAttr;
 	}
 	
-	m_edited_item.m_weapon_attr->m_weapon_type = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TypeLabel","sword");
+	m_edited_item.m_weapon_attr->m_weapon_type = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TypeLabel", "sword");
 	
 	Damage& dmg = m_edited_item.m_weapon_attr->m_damage;
 	
-	dmg.m_min_damage[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMinSpinner",1);
-	dmg.m_max_damage[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner",1);
+	dmg.m_min_damage[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMinSpinner", 1);
+	dmg.m_max_damage[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner", 1);
 	if (dmg.m_max_damage[Damage::PHYSICAL] < dmg.m_min_damage[Damage::PHYSICAL])
 	{
 		dmg.m_max_damage[Damage::PHYSICAL] =  dmg.m_min_damage[Damage::PHYSICAL];
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner",dmg.m_max_damage[Damage::PHYSICAL]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner", dmg.m_max_damage[Damage::PHYSICAL]);
 	}
-	dmg.m_multiplier[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultSpinner",1);
+	dmg.m_multiplier[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultSpinner", 1);
 	
-	dmg.m_min_damage[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMinSpinner",1);
-	dmg.m_max_damage[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner",1);
+	dmg.m_min_damage[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMinSpinner", 1);
+	dmg.m_max_damage[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner", 1);
 	if (dmg.m_max_damage[Damage::FIRE] < dmg.m_min_damage[Damage::FIRE])
 	{
 		dmg.m_max_damage[Damage::FIRE] =  dmg.m_min_damage[Damage::FIRE];
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner",dmg.m_max_damage[Damage::FIRE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner", dmg.m_max_damage[Damage::FIRE]);
 	}
-	dmg.m_multiplier[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultSpinner",1);
+	dmg.m_multiplier[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultSpinner", 1);
 	
-	dmg.m_min_damage[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMinSpinner",1);
-	dmg.m_max_damage[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner",1);
+	dmg.m_min_damage[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMinSpinner", 1);
+	dmg.m_max_damage[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner", 1);
 	if (dmg.m_max_damage[Damage::ICE] < dmg.m_min_damage[Damage::ICE])
 	{
 		dmg.m_max_damage[Damage::ICE] =  dmg.m_min_damage[Damage::ICE];
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner",dmg.m_max_damage[Damage::ICE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner", dmg.m_max_damage[Damage::ICE]);
 	}
-	dmg.m_multiplier[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultSpinner",1);
+	dmg.m_multiplier[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultSpinner", 1);
 	
-	dmg.m_min_damage[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMinSpinner",1);
-	dmg.m_max_damage[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner",1);
+	dmg.m_min_damage[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMinSpinner", 1);
+	dmg.m_max_damage[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner", 1);
 	if (dmg.m_max_damage[Damage::AIR] < dmg.m_min_damage[Damage::AIR])
 	{
 		dmg.m_max_damage[Damage::AIR] =  dmg.m_min_damage[Damage::AIR];
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner",dmg.m_max_damage[Damage::AIR]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner", dmg.m_max_damage[Damage::AIR]);
 	}
-	dmg.m_multiplier[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultSpinner",1);
+	dmg.m_multiplier[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultSpinner", 1);
 	
-	dmg.m_attack = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionSpinner",1);
-	dmg.m_power = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerSpinner",1);
-	dmg.m_crit_perc = 0.01* getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentSpinner",1);
+	dmg.m_attack = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionSpinner", 1);
+	dmg.m_power = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerSpinner", 1);
+	dmg.m_crit_perc = 0.01* getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentSpinner", 1);
 	
 	m_edited_item.m_weapon_attr->m_attack_range = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/RangeSpinner");
 	m_edited_item.m_weapon_attr->m_dattack_speed = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/SpeedSpinner");
@@ -473,7 +545,10 @@
 bool ItemEditor::onConsumeEffectsModified(const CEGUI::EventArgs& evt)
 {
 	if (m_no_cegui_events)
+  {
 		return true;
+  }
+
 	m_no_cegui_events = true;
 	
 	if (m_edited_item.m_useup_effect == 0)
@@ -502,7 +577,10 @@
 bool ItemEditor::onEquipEffectsModified(const CEGUI::EventArgs& evt)
 {
 	if (m_no_cegui_events)
+  {
 		return true;
+  }
+
 	m_no_cegui_events = true;
 	
 	if (m_edited_item.m_equip_effect == 0)
@@ -514,20 +592,38 @@
 	
 	basemod->m_dmax_health = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner");
 	
-	basemod->m_dstrength = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner");
-	basemod->m_ddexterity = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner");
-	basemod->m_dmagic_power = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner");
-	basemod->m_dwillpower = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner");
+	basemod->m_dstrength = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner"));
+
+	basemod->m_ddexterity = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner"));
+
+	basemod->m_dmagic_power = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner"));
+	basemod->m_dwillpower = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner"));
 	
-	basemod->m_dresistances[Damage::PHYSICAL] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner");
-	basemod->m_dresistances[Damage::FIRE] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner");
-	basemod->m_dresistances[Damage::ICE] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner");
-	basemod->m_dresistances[Damage::AIR] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner");
+	basemod->m_dresistances[Damage::PHYSICAL] = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner"));
+
+	basemod->m_dresistances[Damage::FIRE] = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner"));
+	basemod->m_dresistances[Damage::ICE] = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner"));
+	basemod->m_dresistances[Damage::AIR] = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner"));
 	
-	basemod->m_darmor = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner");
-	basemod->m_dblock = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner");
-	basemod->m_dattack = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner");
-	basemod->m_dpower = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner");
+	basemod->m_darmor = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner"));
+
+	basemod->m_dblock = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner"));
+
+	basemod->m_dattack = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner"));
+
+	basemod->m_dpower = static_cast<int>(
+      getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner"));
 	
 	
 	m_no_cegui_events = false;
@@ -559,7 +655,7 @@
 		m_item_xml.LinkEndChild(item_temp_xml.RootElement()->Clone());
 		
 		// parse the XML to the fixed object data
-		std::string subtype = ItemLoader::loadItem(m_item_xml.FirstChildElement(),true);
+		std::string subtype = ItemLoader::loadItem(m_item_xml.FirstChildElement(), true);
 		// copy to the local Data structure
 		ItemBasicData* data = ItemFactory::getItemBasicData(subtype);
 		if (data != 0)
@@ -576,7 +672,9 @@
 		int err_row = item_temp_xml.ErrorRow();
 		int err_col = item_temp_xml.ErrorCol();
 		
-		setMultiLineEditboxCursor("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/ItemXMLEditbox",err_row,err_col);
+		setMultiLineEditboxCursor(
+        "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/ItemXMLEditbox",
+        err_row, err_col);
 	}
 	
 	return true;
@@ -598,10 +696,10 @@
 	Ogre::SceneNode* topnode = ri_editor->getEditedGraphicObject()->getTopNode();
 	topnode->_updateBounds();
 	
-	Ogre::Vector3 bbox_min(1000,1000,1000);
-	Ogre::Vector3 bbox_max(-1000,-1000,-1000);
+	Ogre::Vector3 bbox_min(1000, 1000, 1000);
+	Ogre::Vector3 bbox_max(-1000, -1000, -1000);
 	
-	getNodeBounds(topnode,bbox_min,bbox_max);
+	getNodeBounds(topnode, bbox_min, bbox_max);
 	
 	double size_x = bbox_max[0] - bbox_min[0];
 	double size_z = bbox_max[2] - bbox_min[2];
@@ -611,10 +709,10 @@
 	
 	//DEBUG("box %f %f %f - %f %f %f",bbox_min[0],bbox_min[1],bbox_min[2],bbox_max[0],bbox_max[1],bbox_max[2]);
 	
-	item_camera->setPosition(Ogre::Vector3(center_x, viewsize*sqrt(double(2)),center_z));
+	item_camera->setPosition(Ogre::Vector3(center_x, viewsize*sqrt(double(2)), center_z));
 	// item_camera->setPosition(Ogre::Vector3(center_x, 1,center_z));
 	//item_camera->setPosition(Ogre::Vector3(0,1,0));
-	item_camera->lookAt(Ogre::Vector3(center_x, 0,center_z));
+	item_camera->lookAt(Ogre::Vector3(center_x, 0, center_z));
 	
 	// texture that is created from the camera image
 	Ogre::TexturePtr item_texture = Ogre::TextureManager::getSingleton().createManual( std::string("item_tex_") + idstream.str(),
@@ -625,9 +723,9 @@
 	Ogre::RenderTarget* item_rt = item_texture->getBuffer()->getRenderTarget();
 	item_rt->setAutoUpdated(false);
 	Ogre::Viewport *item_view = item_rt->addViewport(item_camera );
-	item_view->setClearEveryFrame( true );
-	item_view->setOverlaysEnabled (false);
-	item_view->setBackgroundColour(Ogre::ColourValue(0,0,0,1.0) );
+	item_view->setClearEveryFrame(true);
+	item_view->setOverlaysEnabled(false);
+	item_view->setBackgroundColour(Ogre::ColourValue(0, 0, 0, 1.0) );
 
 #ifdef CEGUI_07
 	// create a CEGUI Image from the Texture
@@ -671,9 +769,12 @@
 	// temporarily replace the renderinfo name
 	TiXmlElement * item_ri = m_item_xml.RootElement()->FirstChildElement("RenderInfo");
 	if (item_ri == 0)
+  {
 		return 0;
+  }
+
 	std::string name = item_ri->Attribute("name");
-	item_ri->SetAttribute("name",unique_ri.c_str());
+	item_ri->SetAttribute("name", unique_ri.c_str());
 	
 	// temporarily replace the image name
 	TiXmlElement * item_image = m_item_xml.RootElement()->FirstChildElement("Image");
@@ -693,7 +794,7 @@
 		
 		// itemimage.str("");
 		// itemimage << "set:editor_imageset image:editor_img";
-		item_image->SetAttribute("image",itemimage.str().c_str());
+		item_image->SetAttribute("image", itemimage.str().c_str());
 	}
 
 	// make the item subtype unique by adding a number
@@ -701,16 +802,16 @@
 	std::stringstream stream;
 	stream << plain_subtype << m_unique_id;
 	m_unique_id++;
-	m_item_xml.RootElement()->SetAttribute("subtype",stream.str().c_str());
+	m_item_xml.RootElement()->SetAttribute("subtype", stream.str().c_str());
 	
-	std::string subtype = ItemLoader::loadItem(m_item_xml.FirstChildElement(),true);
+	std::string subtype = ItemLoader::loadItem(m_item_xml.FirstChildElement(), true);
 	
 	// reset the changed attributes
-	item_ri->SetAttribute("name",name.c_str());
-	m_item_xml.RootElement()->SetAttribute("subtype",plain_subtype.c_str());
-	item_image->SetAttribute("image",image.c_str());
+	item_ri->SetAttribute("name", name.c_str());
+	m_item_xml.RootElement()->SetAttribute("subtype", plain_subtype.c_str());
+	item_image->SetAttribute("image", image.c_str());
 	
-	float magic = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Create/EnchantSpinner",0);
+	float magic = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Create/EnchantSpinner", 0);
 	Item::Type type = ItemFactory::getBaseType(subtype);
 	Item* item = ItemFactory::createItem(type, subtype, 0, magic);
 	return item;
@@ -742,7 +843,7 @@
 		return true;
   }
 
-	region->dropItem(item,pos);
+	region->dropItem(item, pos);
 	
 	return true;
 }
@@ -816,20 +917,44 @@
 {
 	m_no_cegui_events = true;
 	
-	setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/PriceSpinner",m_edited_item.m_price);
-	setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMinSpinner",m_edited_item.m_min_enchant);
-	setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxSpinner",m_edited_item.m_max_enchant);
-	setWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/NameBox",m_edited_item.m_name);
+	setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/PriceSpinner", m_edited_item.m_price);
+	setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMinSpinner", m_edited_item.m_min_enchant);
+	setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxSpinner", m_edited_item.m_max_enchant);
+	setWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/NameBox", m_edited_item.m_name);
 	
 	Item::Type type = m_edited_item.m_type;
-	if (type == Item::ARMOR) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Armor");
-	else if (type == Item::WEAPON) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Weapon");
-	else if (type == Item::HELMET) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Helmet");
-	else if (type == Item::GLOVES) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Gloves");
-	else if (type == Item::RING) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Ring");
-	else if (type == Item::AMULET) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Amulet");
-	else if (type == Item::SHIELD) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Shield");
-	else if (type == Item::POTION) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Potion");
+	if (type == Item::ARMOR)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Armor");
+  }
+	else if (type == Item::WEAPON)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Weapon");
+  }
+	else if (type == Item::HELMET)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Helmet");
+  }
+	else if (type == Item::GLOVES)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Gloves");
+  }
+	else if (type == Item::RING)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Ring");
+  }
+	else if (type == Item::AMULET)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Amulet");
+  }
+	else if (type == Item::SHIELD)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Shield");
+  }
+	else if (type == Item::POTION)
+  {
+    setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Potion");
+  }
 	
 	Item::Size size = m_edited_item.m_size;
 	if (size == Item::BIG) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/SizeBox","Big");
@@ -841,30 +966,30 @@
 	{
 		Damage& dmg = m_edited_item.m_weapon_attr->m_damage;
 		
-		setWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TypeBox",m_edited_item.m_weapon_attr->m_weapon_type);
+		setWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TypeBox", m_edited_item.m_weapon_attr->m_weapon_type);
 
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMinSpinner",dmg.m_min_damage[Damage::PHYSICAL]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner",dmg.m_max_damage[Damage::PHYSICAL]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultSpinner",dmg.m_multiplier[Damage::PHYSICAL]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMinSpinner", dmg.m_min_damage[Damage::PHYSICAL]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner", dmg.m_max_damage[Damage::PHYSICAL]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultSpinner", dmg.m_multiplier[Damage::PHYSICAL]);
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMinSpinner",dmg.m_min_damage[Damage::FIRE]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner",dmg.m_max_damage[Damage::FIRE]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultSpinner",dmg.m_multiplier[Damage::FIRE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMinSpinner", dmg.m_min_damage[Damage::FIRE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner", dmg.m_max_damage[Damage::FIRE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultSpinner", dmg.m_multiplier[Damage::FIRE]);
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMinSpinner",dmg.m_min_damage[Damage::ICE]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner",dmg.m_max_damage[Damage::ICE]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultSpinner",dmg.m_multiplier[Damage::ICE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMinSpinner", dmg.m_min_damage[Damage::ICE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner", dmg.m_max_damage[Damage::ICE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultSpinner", dmg.m_multiplier[Damage::ICE]);
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMinSpinner",dmg.m_min_damage[Damage::AIR]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner",dmg.m_max_damage[Damage::AIR]);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultSpinner",dmg.m_multiplier[Damage::AIR]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMinSpinner", dmg.m_min_damage[Damage::AIR]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner", dmg.m_max_damage[Damage::AIR]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultSpinner", dmg.m_multiplier[Damage::AIR]);
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionSpinner",dmg.m_attack);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerSpinner",dmg.m_power);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentSpinner",dmg.m_crit_perc*100);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionSpinner", dmg.m_attack);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerSpinner", dmg.m_power);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentSpinner", dmg.m_crit_perc*100);
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/RangeSpinner",m_edited_item.m_weapon_attr->m_attack_range);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/SpeedSpinner",m_edited_item.m_weapon_attr->m_dattack_speed );
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/RangeSpinner", m_edited_item.m_weapon_attr->m_attack_range);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/SpeedSpinner", m_edited_item.m_weapon_attr->m_dattack_speed );
 		
 		setCheckboxSelected("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TwohandedCheckbox", m_edited_item.m_weapon_attr->m_two_handed);
 	}
@@ -875,41 +1000,38 @@
 		CreatureDynAttrMod* dynmod = m_edited_item.m_useup_effect;
 		
 		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/HealthSpinner", dynmod->m_dhealth);
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BLIND] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::POISONED] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BERSERK] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::CONFUSED] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteSpinner",dynmod->m_dstatus_mod_immune_time[Damage::MUTE] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::PARALYZED] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenSpinner",dynmod->m_dstatus_mod_immune_time[Damage::FROZEN] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BURNING] );
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindSpinner", dynmod->m_dstatus_mod_immune_time[Damage::BLIND]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedSpinner", dynmod->m_dstatus_mod_immune_time[Damage::POISONED]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkSpinner", dynmod->m_dstatus_mod_immune_time[Damage::BERSERK]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedSpinner", dynmod->m_dstatus_mod_immune_time[Damage::CONFUSED]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteSpinner", dynmod->m_dstatus_mod_immune_time[Damage::MUTE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedSpinner", dynmod->m_dstatus_mod_immune_time[Damage::PARALYZED]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenSpinner", dynmod->m_dstatus_mod_immune_time[Damage::FROZEN]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningSpinner", dynmod->m_dstatus_mod_immune_time[Damage::BURNING]);
 	}
 
 	if (m_edited_item.m_equip_effect != 0)
 	{
 		CreatureBaseAttrMod* basemod = m_edited_item.m_equip_effect;
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner",basemod->m_dmax_health );
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner", basemod->m_dmax_health);
 	
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner",basemod->m_dstrength );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner",basemod->m_ddexterity );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner",basemod->m_dmagic_power );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner",basemod->m_dwillpower );
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner", basemod->m_dstrength);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner", basemod->m_ddexterity);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner", basemod->m_dmagic_power);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner", basemod->m_dwillpower);
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner",basemod->m_dresistances[Damage::PHYSICAL] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner",basemod->m_dresistances[Damage::FIRE] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner",basemod->m_dresistances[Damage::ICE] );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner",basemod->m_dresistances[Damage::AIR] );
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner", basemod->m_dresistances[Damage::PHYSICAL]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner", basemod->m_dresistances[Damage::FIRE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner", basemod->m_dresistances[Damage::ICE]);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner", basemod->m_dresistances[Damage::AIR]);
 		
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner",basemod->m_darmor );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner",basemod->m_dblock );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner",basemod->m_dattack );
-		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner",basemod->m_dpower );
-		
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner", basemod->m_darmor);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner", basemod->m_dblock);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner", basemod->m_dattack);
+		setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner", basemod->m_dpower);
 	}
 
 	m_no_cegui_events = false;
 }
 
-
-