X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=96f6ce99a044472610578e66c90b0a02ce586035;hb=8103796dd981a8a1c2e18979fd5ef3a1f3f1ccdb;hp=97d993e399a8301f841798b59a1515e37738c8bf;hpb=f30bf746981a99079e766b0d4e9de5391a4175ff;p=virtualjaguar diff --git a/src/tom.cpp b/src/tom.cpp index 97d993e..96f6ce9 100644 --- a/src/tom.cpp +++ b/src/tom.cpp @@ -263,7 +263,7 @@ #include "gpu.h" #include "jaguar.h" #include "log.h" -#include "m68k.h" +#include "m68000/m68kinterface.h" //#include "memory.h" #include "op.h" #include "settings.h" @@ -321,8 +321,11 @@ //#define LEFT_VISIBLE_HC (208 - 32) //#define RIGHT_VISIBLE_HC (1488 - 32) // Split the difference? (Seems to be OK for the most part...) -#define LEFT_VISIBLE_HC (208 - 16) -#define RIGHT_VISIBLE_HC (1488 - 16) + +// (-10 +10)*4 is for opening up the display by 16 pixels (may go to 20). Need to change VIRTUAL_SCREEN_WIDTH to match this as well (went from 320 to 340; this is 4 HCs per one of those pixels). +#define LEFT_VISIBLE_HC (208 - 16 - (10 * 4)) +//#define RIGHT_VISIBLE_HC (1488 - 16 + (10 * 4)) +#define RIGHT_VISIBLE_HC (LEFT_VISIBLE_HC + (VIRTUAL_SCREEN_WIDTH * 4)) //#define TOP_VISIBLE_VC 25 //#define BOTTOM_VISIBLE_VC 503 #define TOP_VISIBLE_VC 31 @@ -331,8 +334,9 @@ //Are these PAL horizontals correct? //They seem to be for the most part, but there are some games that seem to be //shifted over to the right from this "window". -#define LEFT_VISIBLE_HC_PAL (208 - 16) -#define RIGHT_VISIBLE_HC_PAL (1488 - 16) +#define LEFT_VISIBLE_HC_PAL (208 - 16 - (10 * 4)) +//#define RIGHT_VISIBLE_HC_PAL (1488 - 16 + (10 * 4)) +#define RIGHT_VISIBLE_HC_PAL (LEFT_VISIBLE_HC_PAL + (VIRTUAL_SCREEN_WIDTH * 4)) #define TOP_VISIBLE_VC_PAL 67 #define BOTTOM_VISIBLE_VC_PAL 579