X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo.cpp;h=1d86f18b83e61dfa725cfd4b5806a0400c7fc4d1;hb=94e1e961b57f253b760298ab0bae96a7de6d20fa;hp=4f33d666b8dd329780c8aac74b8afebf57626725;hpb=f95620384355f3db89f779e1e7be59260ecfc6ff;p=virtualjaguar

diff --git a/src/video.cpp b/src/video.cpp
index 4f33d66..1d86f18 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -2,11 +2,18 @@
 // VIDEO.CPP: SDL/local hardware specific video routines
 //
 // by James L. Hammons
+// (C) 2010 Underground Software
+//
+// JLH = James L. Hammons <jlhamm@acm.org>
+//
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  01/16/2010  Created this log ;-)
 //
 
 #include "video.h"
 
-#include "gui.h"								// For "finished"
+//#include "gui.h"								// For "finished"
 #include "log.h"
 #include "tom.h"
 #include "sdlemu_opengl.h"
@@ -17,7 +24,7 @@
 //shouldn't these exist here??? Prolly.
 //And now, they do! :-)
 SDL_Surface * surface, * mainSurface;
-SDL_Joystick * joystick;
+SDL_Joystick * joystick1;
 Uint32 mainSurfaceFlags;
 //int16 * backbuffer;
 uint32 * backbuffer;
@@ -151,7 +158,7 @@ bool VideoInit(void)
 		}
 		else
 		{
-			if ((joystick = SDL_JoystickOpen(vjs.joyport)) == 0)
+			if ((joystick1 = SDL_JoystickOpen(vjs.joyport)) == 0)
 			{
 				vjs.useJoystick = false;
 				printf("VJ: Unable to open a Joystick on port: %d\n", (int)vjs.joyport);
@@ -179,7 +186,7 @@ void VideoDone(void)
 	if (vjs.useOpenGL)
 		sdlemu_close_opengl();
 
-	SDL_JoystickClose(joystick);
+	SDL_JoystickClose(joystick1);
 	SDL_FreeSurface(surface);
 	free(backbuffer);
 }
@@ -243,7 +250,8 @@ void ResizeScreen(uint32 width, uint32 height)
 //as well as screwing up SDL... !!! FIX !!!
 //		exit(1);
 		// OK, this is cleaner. We can't continue if there is no surface created!
-		finished = true;
+#warning "!!! FIX !!! (finished = true)"
+//		finished = true;
 	}
 
 	if (vjs.useOpenGL)