various fix, especially to use binary only file

Author: Skarsnik

deploy/deploystuff.bat

@@ -1,10 +1,9 @@
 ::change according to your installation
 
-set projectPath=D:\Project\SNESTilesKitten\
-set compilePath=D:\Project\compile\STK\
-set deployPath=D:\Project\SNESTilesKitten\deploy\SNESTilesKitten\
+set projectPath=F:\Project\SNESTilesKitten\
+set compilePath=F:\Project\compile\STK\
+set deployPath=F:\Project\SNESTilesKitten\deploy\SNESTilesKitten\
 set originalBinDir=%compilePath%
-set vscdll=D:\Visual Studio\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\msvcp140.dll
 
 rmdir /Q /S %deployPath%
 mkdir %deployPath%
@@ -15,7 +14,6 @@ mkdir %deployPath%
 
 mkdir %compilePath%
 cd %compilePath%
-set QMAKE_MSC_VER=1910
 qmake %projectPath%\SNESTilesKitten.pro -spec win32-msvc "CONFIG+=release"
 nmake
 
@@ -40,5 +38,3 @@ rmdir /Q /S %deployPath%\imageformats
 del %deployPath%\opengl32sw.dll
 del %deployPath%\libEGL.dll
 del %deployPath%\libGLESV2.dll
-
-xcopy /y "%vscdll%" %deployPath%

mainui.cpp

@@ -184,7 +184,7 @@ void MainUI::closeEvent(QCloseEvent *event)
 void MainUI::on_romOpenButton_clicked()
 {
     QString fileName = QFileDialog::getOpenFileName(this,
-          tr("Select ROM"), lastROMDirectory, tr("SNES ROM (*.smc *.sfc);;All files (*)"));
+          tr("Select ROM"), lastROMDirectory, tr("SNES ROM or associated (*.smc *.sfc *.gfx *.bin);;All files (*)"));
     if (!fileName.isNull())
         openRom(fileName);
 }

romdataengine.cpp

@@ -230,8 +230,10 @@ QString ROMDataEngine::getRomFile() const
 
 void ROMDataEngine::setRomFile(const QString &value)
 {
+    qDebug() << "Loading rom " << value;
     romFile = value;
     ROMInfo romI(romFile);
+    qDebug() << romI.size;
     romInfo = romI;
 }
 
@@ -261,7 +263,7 @@ unsigned int ROMDataEngine::snesToPC(unsigned int romAddr, QString romType)
     return rommapping_snes_to_pc(romAddr, rType, false);
 }
 
-unsigned int ROMDataEngine::getRomPosition(const TilePreset &preset, unsigned int directAddr, unsigned int snesAddr)
+unsigned int ROMDataEngine::getRomPosition(const TilePreset &preset, int directAddr, unsigned int snesAddr)
 {
     bool    romHasHeader = romInfo.hasHeader;
     if (overrideHeaderInfo)
@@ -270,7 +272,7 @@ unsigned int ROMDataEngine::getRomPosition(const TilePreset &preset, unsigned in
     enum rom_type rType = HiROM;
     if (preset.romType == "LoROM")
         rType = LoROM;
-    if (directAddr == 0) {
+    if (directAddr == -1) {
         filePos = rommapping_snes_to_pc(snesAddr, rType, romHasHeader);
     } else {
         filePos = directAddr;

romdataengine.h

@@ -38,7 +38,7 @@ class ROMDataEngine
     static unsigned int                             snesToPC(unsigned int romAddr, QString romType);
 
 private:
-    unsigned int getRomPosition(const TilePreset &preset, unsigned int directAddr, unsigned int snesAddr);
+    unsigned int getRomPosition(const TilePreset &preset, int directAddr, unsigned int snesAddr);
     QString romFile;
 
     static bool                                 loadedCompressionPlugins;

rominfo.cpp

@@ -17,14 +17,15 @@ ROMInfo::ROMInfo(QString romFile)
     QFile f(romFile);
     f.open(QIODevice::ReadOnly);
     if (f.size())
-    if (f.size() & 0x200)
     {
-        qDebug() << "ROM has header";
-        hasHeader = true;
-    }
-    else {
-        hasHeader = false;
-        qDebug() << "ROM has no header";
+        if (f.size() & 0x200)
+        {
+            qDebug() << "ROM has header";
+            hasHeader = true;
+        } else {
+            hasHeader = false;
+            qDebug() << "ROM has no header";
+        }
     }
     /* 0xFC0 - 21 game title
        0xFD5 -  rom makeup?
@@ -52,4 +53,5 @@ ROMInfo::ROMInfo(QString romFile)
         romType = "LoROM";
     }
     romTitle = mromTitle;
+    qDebug() << romFile << "is " << romType << hasHeader << size;
 }

tilepreset.cpp

@@ -9,7 +9,7 @@ TilePreset::TilePreset()
     romName = "";
     romType = "";
 
-    pcTilesLocation = 0;
+    pcTilesLocation = -1;
     SNESTilesLocation = 0;
     length = 0;
     bpp = 0;

tilepreset.h

@@ -18,7 +18,7 @@ class TilePreset
     TilesPattern    tilesPattern;
 
     unsigned int    SNESTilesLocation;
-    unsigned int    pcTilesLocation;
+             int    pcTilesLocation;
     unsigned int    SNESPaletteLocation;
     unsigned int    pcPaletteLocation;
     bool            paletteNoZeroColor;