checkpoint

Author: cfrankb

src/data/animz.obl

@@ -68,7 +68,7 @@ CDlgStat::CDlgStat(const uint8_t tileID, const uint8_t attr, QWidget *parent)
 QString CDlgStat::attr2text(const uint8_t attr) {
     if (RANGE(attr, ATTR_MSG_MIN, ATTR_MSG_MAX)) {
         return "Message";
-    } else if (RANGE(attr, ATTR_WAIT_MIN, ATTR_WAIT_MAX)) {
+    } else if (RANGE(attr, ATTR_IDLE_MIN, ATTR_IDLE_MAX)) {
         return tr("Wait");
     } else if (attr == ATTR_FREEZE_TRAP) {
         return tr("Freeze Trap");

src/data/annie.obl

@@ -84,14 +84,14 @@ void CDlgTest::setZoom(bool zoom)
 {
     CGameMixin::setZoom(zoom);
     int factor = m_zoom ? 2 : 1;
-    this->setMaximumSize(QSize(WIDTH * factor, HEIGHT * factor));
-    this->setMinimumSize(QSize(WIDTH * factor, HEIGHT * factor));
-    this->resize(QSize(WIDTH * factor, HEIGHT * factor));
+    this->setMaximumSize(QSize(getWidth() * factor, getHeight() * factor));
+    this->setMinimumSize(QSize(getWidth() * factor, getHeight() * factor));
+    this->resize(QSize(getWidth() * factor, getHeight() * factor));
 }
 
 void CDlgTest::paintEvent(QPaintEvent *)
 {
-    CFrame bitmap(WIDTH, HEIGHT);
+    CFrame bitmap(getWidth(), getHeight());
     switch (m_game->mode())
     {
     case CGame::MODE_CHUTE:
@@ -114,12 +114,13 @@ void CDlgTest::paintEvent(QPaintEvent *)
     case CGame::MODE_LEVEL_SUMMARY:
     case CGame::MODE_SKLLSELECT:
     case CGame::MODE_NEW_INPUTNAME:
+    case CGame::MODE_TEST:
         break;
     }
 
     // show the screen
     const QImage & img = QImage(reinterpret_cast<uint8_t*>(bitmap.getRGB().data()), bitmap.width(), bitmap.height(), QImage::Format_RGBX8888);
-    const QPixmap & pixmap = QPixmap::fromImage(m_zoom ? img.scaled(QSize(WIDTH * 2, HEIGHT * 2)): img);
+    const QPixmap & pixmap = QPixmap::fromImage(m_zoom ? img.scaled(QSize(getWidth() * 2, getHeight() * 2)): img);
     QPainter p(this);
     p.drawPixmap(0, 0, pixmap);
     p.end();
@@ -177,7 +178,8 @@ void CDlgTest::preloadAssets()
         {":/data/tiles.obl", &m_tiles},
         {":/data/animz.obl", &m_animz},
         {":/data/annie.obl", &m_users},
-        {":/data/bosses.obl", &m_bosses},
+        {":/data/sheet0.obl", &m_sheet0},
+        {":/data/sheet1.obl", &m_sheet1},
         {":/data/uisheet.png", &m_uisheet}
     };
 

src/data/bosses.obl

@@ -24,7 +24,7 @@
 #include "report.h"
 #include "keyvaluedialog.h"
 #include "runtime/statedata.h"
-#include "dlgmsgs.h"
+//#include "dlgmsgs.h"
 #include "mapprops.h"
 
 MainWindow::MainWindow(QWidget *parent)
@@ -678,7 +678,16 @@ void MainWindow::on_actionEdit_Next_Map_triggered()
 
 void MainWindow::on_actionEdit_Add_Map_triggered()
 {
+    bool ok;
+    QString text = QInputDialog::getText(this, tr("Add New Map"),
+                                         tr("Name:"), QLineEdit::Normal,
+                                         m_doc.map()->title(), &ok);
+    if (!ok)
+        return;
+    text = text.trimmed().mid(0, 254);
+
     std::unique_ptr<CMap> map = std::make_unique<CMap>(64,64);
+    map->setTitle(text.toLatin1());
     m_doc.add(std::move(map));
     m_doc.setCurrentIndex(m_doc.size() - 1);
     m_doc.setDirty(true);
@@ -706,8 +715,17 @@ void MainWindow::on_actionEdit_Delete_Map_triggered()
 
 void MainWindow::on_actionEdit_Insert_Map_triggered()
 {
+    bool ok;
+    QString text = QInputDialog::getText(this, tr("Insert New Map"),
+                                         tr("Name:"), QLineEdit::Normal,
+                                         m_doc.map()->title(), &ok);
+    if (!ok)
+        return;
+    text = text.trimmed().mid(0, 254);
+
     int index = m_doc.currentIndex();
     std::unique_ptr<CMap> map = std::make_unique<CMap>(64, 64);
+    map->setTitle(text.toLatin1());
     m_doc.insertAt(index, std::move(map));  // Only ONE move operation
     m_doc.setDirty(true);
     emit mapChanged(m_doc.map());
@@ -984,12 +1002,10 @@ void MainWindow::on_actionExport_Screenshots_triggered()
 
 void MainWindow::on_actionEdit_Edit_Messages_triggered()
 {
-    CDlgMsgs dialog(this);
-    dialog.setWindowTitle(tr("Edit Messages"));
-    dialog.populateData(*m_doc.map());
+    MapPropertiesDialog dialog(m_doc.map(), this, MapPropertiesDialog::TAB_MESSAGES);
     if (dialog.exec() == QDialog::Accepted) {
+        // Changes have been saved to the states object
         m_doc.setDirty(true);
-        dialog.saveData(*m_doc.map());
     }
 }
 
@@ -1001,4 +1017,3 @@ void MainWindow::on_actionEdit_Map_Properties_triggered()
         m_doc.setDirty(true);
     }
 }
-

src/data/sheet0.obl

@@ -11,7 +11,7 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs depr
 INCLUDEPATH += runtime/shared/
 DEFINES += USE_QFILE=1
 #DEFINES += USE_SDL_MIXER=1
-#DEFINES += USE_HUNSPELL=1
+DEFINES += USE_HUNSPELL=1
 
 SOURCES += \
     runtime/ai_path.cpp \
@@ -46,7 +46,7 @@ SOURCES += \
     runtime/strhelper.cpp \
     runtime/boss.cpp \
     dlgattr.cpp \
-    dlgmsgs.cpp \
+    #dlgmsgs.cpp \
     dlgresize.cpp \
     dlgabout.cpp \
     dlgselect.cpp \
@@ -112,7 +112,7 @@ HEADERS += \
     runtime/joyaim.h \
     app_version.h \
     dlgattr.h \
-    dlgmsgs.h \
+    #dlgmsgs.h \
     dlgresize.h \
     dlgabout.h \
     dlgselect.h \
@@ -129,7 +129,7 @@ HEADERS += \
 
 FORMS += \
     dlgattr.ui \
-    dlgmsgs.ui \
+#    dlgmsgs.ui \
     dlgresize.ui \
     dlgabout.ui \
     dlgselect.ui \