Wild save file contained 0x05 "unsigned long" type of Trait Objects (…

…normally it is 0x02 "short")
fischerdr · Aug 19, 2014 · b6a5b57 · b6a5b57
1 parent b88c10b
commit b6a5b57
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/MooseEdit.pro.user b/MooseEdit.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.2, 2014-08-14T20:47:45. -->
+<!-- Written by QtCreator 3.1.2, 2014-08-18T21:20:37. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

diff --git a/TraitWidget.cpp b/TraitWidget.cpp
@@ -79,7 +79,12 @@ void TraitWidget::editTextChanged(const QString &text, QLabel *label) {
 			if (id != -1 && id < traitObjects.size()) {
 				LsbObject *traitObject = traitObjects[id];
 				if (traitObject != 0) {
-					traitObject->setData((char *)&value, sizeof(short));
+					if (traitObject->getType() == 0x02) {
+						traitObject->setData((char *)&value, sizeof(short));
+					} else {
+						unsigned long longValue = value;
+						traitObject->setData((char *)&longValue, sizeof(longValue));
+					}
 				}
 			}
 		}

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -275,6 +275,10 @@ void MainWindow::unload() {
 		delete globals[i];
 	}
 	globals.clear();
+	for (int i=0; i<globalTagList.size(); ++i) {
+		delete globalTagList[i];
+	}
+	globalTagList.clear();
 }
 
 void MainWindow::handleLoadButton() {
@@ -368,6 +372,11 @@ void MainWindow::handleLoadButton() {
 						equipHandler->addItem(item);
 					}
 					charTab->setEquipmentHandler(equipHandler);
+
+					QTreeWidget *tree = this->findChild<QTreeWidget *>("treeWidget");
+					std::vector<LsbObject *> one;
+					one.push_back(character->getObject());
+					displayAllItems2(tree, one);
 				}
 			}
 			else {