X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=0619b0523d070f2de61b07053a0ca800aaffa9cf;hb=51dd66b8138173fdb3d9722f617c80911929c189;hp=763d440ba9eb7b218ce2beb3460ea426ee952033;hpb=d239de704f276a75d927900e3d413a44cc87116c;p=virtualjaguar

diff --git a/src/vj.cpp b/src/vj.cpp
index 763d440..0619b05 100644
--- a/src/vj.cpp
+++ b/src/vj.cpp
@@ -9,7 +9,7 @@
 #include <SDL.h>
 #include <time.h>
 #include "file.h"
-#include "gui.h"
+//#include "gui.h"
 #include "jaguar.h"
 #include "log.h"
 #include "memory.h"
@@ -39,7 +39,7 @@
 //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...
-int main(int argc, char * argv[])
+int main_old(int argc, char * argv[])
 {
 //NOTE: This isn't actually used anywhere... !!! FIX !!!
 	int32 nFrameskip = 0;							// Default: Show every frame
@@ -157,8 +157,8 @@ int main(int argc, char * argv[])
 
 	WriteLog("VJ: SDL successfully initialized.\n");
 
-	WriteLog("Initializing memory subsystem...\n");
-	MemoryInit();
+//	WriteLog("Initializing memory subsystem...\n");
+//	MemoryInit();
 #ifdef VJ_RELEASE_VERSION
 	WriteLog("Virtual Jaguar %s (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__);
 #else
@@ -170,29 +170,31 @@ int main(int argc, char * argv[])
 	// Get the BIOS ROM
 #ifdef USE_BUILT_IN_BIOS
 	WriteLog("VJ: Using built in BIOS/CD BIOS...\n");
-	memcpy(jaguarBootRom, jagBootROM, 0x20000);
+	memcpy(jaguarBootROM, jagBootROM, 0x20000);
 	memcpy(jaguarCDBootROM, jagCDROM, 0x40000);
 	BIOSLoaded = CDBIOSLoaded = true;
 #else
 // 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");
-	BIOSLoaded = (JaguarLoadROM(jaguarBootRom, vjs.jagBootPath) == 0x20000 ? true : false);
+	BIOSLoaded = (JaguarLoadROM(jaguarBootROM, vjs.jagBootPath) == 0x20000 ? true : false);
 	WriteLog("VJ: BIOS is %savailable...\n", (BIOSLoaded ? "" : "not "));
 	CDBIOSLoaded = (JaguarLoadROM(jaguarCDBootROM, vjs.CDBootPath) == 0x40000 ? true : false);
 	WriteLog("VJ: CD BIOS is %savailable...\n", (CDBIOSLoaded ? "" : "not "));
 #endif
 
-	SET32(jaguarMainRam, 0, 0x00200000);			// Set top of stack...
+	SET32(jaguarMainRAM, 0, 0x00200000);			// Set top of stack...
 
 WriteLog("Initializing video subsystem...\n");
 	VideoInit();
 WriteLog("Initializing GUI subsystem...\n");
-	GUIInit();
+#warning "!!! FIX !!! (GUIInit())"
+//	GUIInit();
 
 	// Now with crunchy GUI goodness!
 WriteLog("About to start GUI...\n");
-	GUIMain(haveCart ? argv[1] : NULL);
+#warning "!!! FIX !!! (GUIMain(...))"
+//	GUIMain(haveCart ? argv[1] : NULL);
 
 //This is no longer accurate...!
 //	int elapsedTime = clock() - startTime;
@@ -201,12 +203,12 @@ WriteLog("About to start GUI...\n");
 
 	JaguarDone();
 	VideoDone();
-	MemoryDone();
+//	MemoryDone();
 	LogDone();
 
 	// Free SDL components last...!
 	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
 	SDL_Quit();
 
-    return 0;
+	return 0;
 }