diff options
author | Twinaphex | 2017-01-29 06:00:06 +0100 |
---|---|---|
committer | GitHub | 2017-01-29 06:00:06 +0100 |
commit | b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b (patch) | |
tree | adce7b06d1acc25f52c6e10616451bba02f9f7a5 /source/cpuexec.h | |
parent | 813fc89d37d1d8c8d2fa090a28f74aa0fdcea5df (diff) | |
parent | 0e59b999fa976de2d00490f552a1ff0a27d40f63 (diff) | |
download | snesemu-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.tar.gz snesemu-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.tar.bz2 snesemu-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.zip |
Merge pull request #30 from jamsilva/master
Converted most types to stdint-style (fixing a few in the process).
Diffstat (limited to 'source/cpuexec.h')
-rw-r--r-- | source/cpuexec.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/cpuexec.h b/source/cpuexec.h index 5ecce18..c4342be 100644 --- a/source/cpuexec.h +++ b/source/cpuexec.h @@ -102,7 +102,7 @@ static inline void S9xFixCycles() static inline void S9xReschedule() { uint8_t which; - long max; + int32_t max; if (CPU.WhichEvent == HBLANK_START_EVENT || CPU.WhichEvent == HTIMER_AFTER_EVENT) @@ -117,12 +117,12 @@ static inline void S9xReschedule() } if (PPU.HTimerEnabled && - (long) PPU.HTimerPosition < max && - (long) PPU.HTimerPosition > CPU.NextEvent && + (int32_t) PPU.HTimerPosition < max && + (int32_t) PPU.HTimerPosition > CPU.NextEvent && (!PPU.VTimerEnabled || - (PPU.VTimerEnabled && CPU.V_Counter == PPU.IRQVBeamPos))) + (PPU.VTimerEnabled && CPU.V_Counter == PPU.IRQVBeamPos))) { - which = (long) PPU.HTimerPosition < Settings.HBlankStart ? + which = (int32_t) PPU.HTimerPosition < Settings.HBlankStart ? HTIMER_BEFORE_EVENT : HTIMER_AFTER_EVENT; max = PPU.HTimerPosition; } |