From 1249f1ad7191432e9fb8b3162ebb1d66a94fdcb9 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Mon, 20 Oct 2014 20:02:42 -0500 Subject: [PATCH 1/1] Miscellaneous fixes, plus extra whitespace munging for good effect. Fixed a bug in the TOM 16 bit LUTs, the red value mask was wrong. Fixed a typo in jaguar.cpp. Added feedback to user if they tried to pass in a filename to a piece of software that wasn't found. And some whitespace futzing, because that's how we roll. :-) --- res/vj-ico.o | Bin 3542 -> 0 bytes src/gui/app.cpp | 18 +++++++++++++----- src/gui/mainwin.h | 2 ++ src/jaguar.cpp | 2 +- src/tom.cpp | 3 ++- 5 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 res/vj-ico.o diff --git a/res/vj-ico.o b/res/vj-ico.o deleted file mode 100644 index d8d5bf8d430fcb0a9b7d07a1c56d4b12b8b4d144..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3542 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 CXi+r) diff --git a/src/gui/app.cpp b/src/gui/app.cpp index c0e434d..8cf3f1e 100644 --- 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 a87289d..4263cb1 100644 --- 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/jaguar.cpp b/src/jaguar.cpp index c717431..ac8a430 100644 --- a/src/jaguar.cpp +++ b/src/jaguar.cpp @@ -182,7 +182,7 @@ if (inRoutine) if (m68kPC & 0x01) // Oops! We're fetching an odd address! { - WriteLog("M68K: Attempted to execute from an odd adress!\n\nBacktrace:\n\n"); + WriteLog("M68K: Attempted to execute from an odd address!\n\nBacktrace:\n\n"); static char buffer[2048]; for(int i=0; i<0x400; i++) diff --git a/src/tom.cpp b/src/tom.cpp index 34d7696..dc44995 100644 --- 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 -- 2.37.2