Removed Doom kludge

[virtualjaguar] / src / tom.cpp

diff --git a/src/tom.cpp b/src/tom.cpp
index 7f425b9e6990af913c8c3d0994e528a58217e8f8..27f0a45387abdf58f0618c15cde9f37688f3c621 100644 (file)
--- a/src/tom.cpp
+++ b/src/tom.cpp
@@ -359,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
@@ -917,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
@@ -970,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);
 }
 
 //
@@ -980,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();