Release 1.11.0

sithlord48 · Mar 15, 2022 · d9f0836 · d9f0836
1 parent 949a63f
commit d9f0836
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(REQUIRED_QT_VERSION "5.15.0")
 
 cmake_policy(SET CMP0010 NEW)
 
-project( blackchocobo VERSION 1.10.5 DESCRIPTION "Final Fantasy 7 Save Editor")
+project( blackchocobo VERSION 1.11.0 DESCRIPTION "Final Fantasy 7 Save Editor")
 # Get the version from git if it's a git repository
 set(BC_VERSION ${CMAKE_PROJECT_VERSION})
 IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
@@ -60,7 +60,7 @@ if(${QT_DEFAULT_MAJOR_VERSION} MATCHES "6")
     find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
 endif()
 
-find_package(ff7tk 0.80.22 REQUIRED NO_MODULE COMPONENTS
+find_package(ff7tk 0.81.00 REQUIRED NO_MODULE COMPONENTS
     ff7tk
     ff7tkWidgets
 )

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1569,7 +1569,7 @@ void MainWindow::materiaupdate(void)
         QString ap;
 
         if (current_id <= 0x5A) {
-            newItem = new QTableWidgetItem(Materias.icon(current_id), Materias.name(current_id), 0);
+            newItem = new QTableWidgetItem(FF7Materia::icon(current_id), FF7Materia::name(current_id), 0);
             ui->tblMateria->setItem(mat, 0, newItem);
         }
 
@@ -1764,7 +1764,7 @@ void MainWindow::updateStolenMateria()
         quint8 current_id = ff7->stolenMateriaId(s, mat);
         QTableWidgetItem *newItem;
         if (current_id != FF7Materia::EmptyId) {
-            newItem = new QTableWidgetItem(Materias.icon(current_id), Materias.name(current_id), 0);
+            newItem = new QTableWidgetItem(FF7Materia::icon(current_id), FF7Materia::name(current_id), 0);
             ui->tblMateriaStolen->setItem(mat, 0, newItem);
             qint32 current_ap = ff7->stolenMateriaAp(s, mat);
             if (current_ap == FF7Materia::MaxMateriaAp) {

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -18,7 +18,6 @@
 #include <QMap>
 
 #include <Type_materia.h>
-#include <FF7Materia.h>
 
 class FF7Save;
 class SaveIcon;
@@ -66,7 +65,6 @@ class MainWindow : public QMainWindow
     FF7Save *ff7 = nullptr; // our save file struct pointer.
     SaveIcon *saveIcon = nullptr;
     int s; //track slot
-    FF7Materia Materias;//FF7Materia Static Data.
     materia buffer_materia; // buffer for a materia
     //ITEM buffer_item; // for use later
     int curchar; //keeps track of current character displayed