Fixed fullscreen<-->windowed mode swith in OpenGL mode, phase one of

[virtualjaguar] / src / vj.cpp

diff --git a/src/vj.cpp b/src/vj.cpp
index 309ec236ff0ce9295896270c5563a27dd92d806b..3f82f8368185ccb7d260235afe2a64d49e0bdd0c 100644 (file)
--- a/src/vj.cpp
+++ b/src/vj.cpp
@@ -6,10 +6,6 @@
 // Cleanups/fixes/enhancements by James L. Hammons and Adam Green
 //
 
-#ifdef __GCCUNIX__
-#include <unistd.h>                                                                    // Is this necessary anymore?
-#endif
-
 #include <time.h>
 #include <SDL.h>
 #include "jaguar.h"
@@ -17,6 +13,10 @@
 #include "gui.h"
 #include "sdlemu_opengl.h"
 #include "settings.h"                                                          // Pull in "vjs" struct
+#include "log.h"
+#include "version.h"
+#include "memory.h"
+#include "file.h"
 
 // Uncomment this to use built-in BIOS/CD-ROM BIOS
 // You'll need a copy of jagboot.h & jagcd.h for this to work...!
@@ -29,30 +29,12 @@
 
 // Private function prototypes
 
-// External variables
-
-extern uint8 * jaguar_mainRam;
-extern uint8 * jaguar_mainRom;
-extern uint8 * jaguar_bootRom;
-extern uint8 * jaguar_CDBootROM;
-
-// Global variables (export capable)
-//should these even be here anymore?
-
-bool finished = false;
-bool showGUI = false;
-bool showMessage = false;
-uint32 showMessageTimeout;
-char messageBuffer[200];
-bool BIOSLoaded = false;
-bool CDBIOSLoaded = false;
-
 //
 // The main emulator loop (what else?)
 //
 //Maybe we should move the video stuff to TOM? Makes more sense to put it there...
 //Actually, it would probably be better served in VIDEO.CPP... !!! FIX !!! [DONE]
-uint32 totalFrames;//temp, so we can grab this from elsewhere...
+//uint32 totalFrames;//temp, so we can grab this from elsewhere...
 int main(int argc, char * argv[])
 {
 //NOTE: This isn't actually used anywhere... !!! FIX !!!
@@ -79,7 +61,7 @@ int main(int argc, char * argv[])
                if (argv[i][0] != '-')
                        haveCart = true;                                                // It looks like we have a cartridge!
 
-               if (!strcmp(argv[i], "-joystick")) 
+               if (!strcmp(argv[i], "-joystick"))
                        vjs.useJoystick = true;
 
                if (!strcmp(argv[i], "-joyport"))
@@ -120,10 +102,10 @@ int main(int argc, char * argv[])
                if (!strcmp(argv[i], "-nogl"))
                        vjs.useOpenGL = false;
 
-               if (!strcmp(argv[i], "-fullscreen")) 
+               if (!strcmp(argv[i], "-fullscreen"))
                        vjs.fullscreen = true;
 
-               if (!strcmp(argv[i], "-window")) 
+               if (!strcmp(argv[i], "-window"))
                        vjs.fullscreen = false;
 
                if (!strcmp(argv[i], "-pal"))
@@ -132,11 +114,11 @@ int main(int argc, char * argv[])
                if (!strcmp(argv[i], "-ntsc"))
                        vjs.hardwareTypeNTSC = true;
 
-               if (!strcmp(argv[i], "-help") || !strcmp(argv[i], "-?"))
+               if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-?"))
                {
                    printf("Usage: \n\n");
                        printf("vj [romfile] [switches]\n");
-                       printf("  -? or -help     : Display usage and switches                \n");
+                       printf("  -? or --help    : Display usage and switches                \n");
                        printf("  -frameskip 1-10 : Enable frameskip 1 - 10 (default: none)   \n");
                        printf("  -joystick       : Enable joystick/gamepad                   \n");
                        printf("  -joyport 0-3    : Select desired joystick port              \n");
@@ -160,8 +142,6 @@ int main(int argc, char * argv[])
 
        // Set up SDL library
        if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER) < 0)
-//             | SDL_INIT_CDROM) < 0)
-//             | SDL_INIT_CDROM | SDL_INIT_NOPARACHUTE) < 0)
        {
                WriteLog("VJ: Could not initialize the SDL library: %s\n", SDL_GetError());
                return -1;
@@ -184,7 +164,6 @@ WriteLog("Initializing jaguar subsystem...\n");
        memcpy(jaguar_CDBootROM, jagCDROM, 0x40000);
        BIOSLoaded = CDBIOSLoaded = true;
 #else
-//     if (vjs.useJaguarBIOS)
 // What would be nice here would be a way to check if the BIOS was loaded so that we
 // could disable the pushbutton on the Misc Options menu... !!! FIX !!! [DONE here, but needs to be fixed in GUI as well!]
 WriteLog("About to attempt to load BIOSes...\n");
@@ -214,10 +193,9 @@ WriteLog("About to start GUI...\n");
        VersionDone();
        MemoryDone();
        VideoDone();
-       log_done();     
+       log_done();
 
        // Free SDL components last...!
-//     SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_CDROM);
        SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
        SDL_Quit();