Merge branch 'master' of http://shamusworld.gotdns.org/git/virtualjaguar

diff --git a/res/vj-ico.o b/res/vj-ico.o
deleted file mode 100644 (file)
index d8d5bf8..0000000
Binary files a/res/vj-ico.o and /dev/null differ

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index c0e434d15b692de90912f06d7596a6fcb63f13e8..8cf3f1ea36159d02ac15ea9cf61dfd763b0249f5 100644 (file)
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -61,11 +61,11 @@ int main(int argc, char * argv[])
        if (AttachConsole != NULL && AttachConsole(((DWORD)-1)))
        {
                if (_fileno(stdout) == -1)
-                       freopen("CONOUT$","wb",stdout);
+                       freopen("CONOUT$", "wb", stdout);
                if (_fileno(stderr) == -1)
-                       freopen("CONOUT$","wb",stderr);
+                       freopen("CONOUT$", "wb", stderr);
                if (_fileno(stdin) == -1)
-                       freopen("CONIN$","rb",stdin);
+                       freopen("CONIN$", "rb", stdin);
 
                // Fix C++
                std::ios::sync_with_stdio();
@@ -123,7 +123,8 @@ int main(int argc, char * argv[])
        fclose(ctt);
 #endif
 #endif
-       LogDone();                                                                      // Close logfile
+       // Close logfile
+       LogDone();
        return retVal;
 }
 
@@ -136,12 +137,18 @@ App::App(int & argc, char * argv[]): QApplication(argc, argv)
 
        mainWindow = new MainWin(loadAndGo);
        mainWindow->plzDontKillMyComputer = noUntunedTankPlease;
-       ParseOptions(argc, argv);                                       // Override defaults with command line (if any)
+       // Override defaults with command line (if any)
+       ParseOptions(argc, argv);
        mainWindow->SyncUI();
 
        if (loadAndGo)
+       {
                mainWindow->LoadFile(filename);
 
+               if (!mainWindow->cartridgeLoaded)
+                       printf("Could not load file \"%s\"!\n", filename.toAscii().data());
+       }
+
        mainWindow->show();
 }
 
@@ -337,3 +344,4 @@ void ParseOptions(int argc, char * argv[])
        char alpineROMPath[MAX_PATH];
        char absROMPath[MAX_PATH];
 #endif
+

diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h
index a87289d47ace2bd0e8873259f635634aefff4a46..4263cb1cb2ad48e6607c58535cb59b1345128000 100644 (file)
--- a/src/gui/mainwin.h
+++ b/src/gui/mainwin.h
@@ -92,7 +92,9 @@ class MainWin: public QMainWindow
                int zoomLevel;
                bool powerButtonOn;
                bool showUntunedTankCircuit;
+       public:
                bool cartridgeLoaded;
+       private:
                bool allowUnknownSoftware;
                bool CDActive;
 //             bool alpineLoadSuccessful;

diff --git a/src/tom.cpp b/src/tom.cpp
index 34d7696f6fc6c9cd9241050dfa0d73d33ed54884..dc44995443b6888e1ca29a9f29942247474e0f14 100644 (file)
--- a/src/tom.cpp
+++ b/src/tom.cpp
@@ -576,7 +576,8 @@ void TOMFillLookupTables(void)
 //                     | ((i & 0x07C0) << 13) | ((i & 0x0700) << 8)
 //                     | ((i & 0x003F) << 10) | ((i & 0x0030) << 4);
                RGB16ToRGB32[i] = 0x000000FF
-                       | ((i & 0xF100) << 16)                                  // Red
+//                     | ((i & 0xF100) << 16)                                  // Red
+                       | ((i & 0xF800) << 16)                                  // Red
                        | ((i & 0x003F) << 18)                                  // Green
                        | ((i & 0x07C0) << 5);                                  // Blue