X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=27f0a45387abdf58f0618c15cde9f37688f3c621;hb=6aa04f4c35e217f50ffb0c4bb11af9f3a0db8a31;hp=c2e4a20e02932c383cf20f37ccf2b95c0044348d;hpb=c9a9d98449eae0da09c63770e9483d4b930c4fc8;p=virtualjaguar

diff --git a/src/tom.cpp b/src/tom.cpp
index c2e4a20..27f0a45 100644
--- a/src/tom.cpp
+++ b/src/tom.cpp
@@ -281,6 +281,8 @@
 #define BG			0x58
 #define INT1		0xE0
 
+//NOTE: These arbitrary cutoffs are NOT taken into account for PAL jaguar screens. !!! FIX !!!
+
 // Arbitrary video cutoff values (i.e., first/last visible spots on a TV, in HC ticks)
 /*#define LEFT_VISIBLE_HC		208
 #define RIGHT_VISIBLE_HC	1528//*/
@@ -357,7 +359,7 @@ render_xxx_scanline_fn * scanline_render_stretch[]=
 render_xxx_scanline_fn * scanline_render[8];
 
 
-// Screen info for various games...
+// Screen info for various games [NTSC]...
 /*
 Doom
 TOM: Horizontal Display End written by M68K: 1727
@@ -915,10 +917,10 @@ uint32 tom_getVideoModeWidth(void)
 	// To make it easier to make a quasi-fixed display size, we restrict the viewing
 	// area to an arbitrary range of the Horizontal Count.
 	uint16 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
-//	return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / pwidth;
+	return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / pwidth;
 //Temporary, for testing Doom...
-	return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 8 ? 4 : pwidth);
-//	return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 4 ? 8 : pwidth);
+//	return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 8 ? 4 : pwidth);
+////	return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 4 ? 8 : pwidth);
 
 // More speculating...
 // According to the JTRM, the number of potential pixels across is given by the
@@ -968,8 +970,9 @@ uint32 tom_getVideoModeHeight(void)
 //	return (vbb - vbe) >> 1;	// Again, doesn't take interlacing into account...
 // This of course doesn't take interlacing into account. But I haven't seen any
 // Jaguar software that takes advantage of it either...
-//Also, doesn't reflect PAL Jaguar either... !!! FIX !!!
-	return 240;										// Set virtual screen height to 240 lines...
+//Also, doesn't reflect PAL Jaguar either... !!! FIX !!! [DONE]
+//	return 240;										// Set virtual screen height to 240 lines...
+	return (vjs.hardwareTypeNTSC ? 240 : 256);
 }
 
 //
@@ -978,8 +981,6 @@ uint32 tom_getVideoModeHeight(void)
 //
 void tom_reset(void)
 {
-//	extern bool hardwareTypeNTSC;
-
 	op_reset();
 	blitter_reset();
 //This should be done by JERRY!		pcm_reset();