X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fevent.h;h=533783cb7b8cc4a9d9bd2f305c430ab9fd36e9d9;hb=7228359373eb7602c26f7b098d6b2271ff5727a1;hp=ff976c966f83c81d96ba145706dc0373616b4e49;hpb=5d76d651dfc3aa0a2e810e6b6db2ae8a2e34c53e;p=virtualjaguar

diff --git a/src/event.h b/src/event.h
index ff976c9..533783c 100644
--- a/src/event.h
+++ b/src/event.h
@@ -10,17 +10,17 @@
 enum { EVENT_MAIN, EVENT_JERRY };
 
 //NTSC Timings...
-#define RISC_CYCLE_IN_USEC        0.03760684198
-#define M68K_CYCLE_IN_USEC        (RISC_CYCLE_IN_USEC * 2)
+#define RISC_CYCLE_IN_USEC			0.03760684198
+#define M68K_CYCLE_IN_USEC			(RISC_CYCLE_IN_USEC * 2)
 //PAL Timings
 #define RISC_CYCLE_PAL_IN_USEC		0.03760260812
 #define M68K_CYCLE_PAL_IN_USEC		(RISC_CYCLE_PAL_IN_USEC * 2)
 
-#define HORIZ_PERIOD_IN_USEC_NTSC 63.555555555
-#define HORIZ_PERIOD_IN_USEC_PAL  64.0
+#define HORIZ_PERIOD_IN_USEC_NTSC	63.555555555
+#define HORIZ_PERIOD_IN_USEC_PAL	64.0
 
-#define USEC_TO_RISC_CYCLES(u) (uint32_t)(((u) / RISC_CYCLE_IN_USEC) + 0.5)
-#define USEC_TO_M68K_CYCLES(u) (uint32_t)(((u) / M68K_CYCLE_IN_USEC) + 0.5)
+#define USEC_TO_RISC_CYCLES(u) (uint32_t)(((u) / (vjs.hardwareTypeNTSC ? RISC_CYCLE_IN_USEC : RISC_CYCLE_PAL_IN_USEC)) + 0.5)
+#define USEC_TO_M68K_CYCLES(u) (uint32_t)(((u) / (vjs.hardwareTypeNTSC ? M68K_CYCLE_IN_USEC : M68K_CYCLE_PAL_IN_USEC)) + 0.5)
 
 void InitializeEventList(void);
 void SetCallbackTime(void (* callback)(void), double time, int type = EVENT_MAIN);