ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB: Make gbTimerOn an INT type instead of BOOL

This commit is contained in:
retro-wertz 2019-02-01 08:25:04 +08:00 committed by Rafael Kitover
parent 43647d3234
commit ba678f4f2e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gb/GB.cpp
View File

@ -127,7 +127,7 @@ int gbSerialOn = 0;
int gbSerialTicks = 0; int gbSerialTicks = 0;
int gbSerialBits = 0; int gbSerialBits = 0;
// timer // timer
bool gbTimerOn = false; int gbTimerOn = 0;
int gbTimerTicks = GBTIMER_MODE_0_CLOCK_TICKS; int gbTimerTicks = GBTIMER_MODE_0_CLOCK_TICKS;
int gbTimerClockTicks = GBTIMER_MODE_0_CLOCK_TICKS; int gbTimerClockTicks = GBTIMER_MODE_0_CLOCK_TICKS;
int gbTimerMode = 0; int gbTimerMode = 0;
@ -1065,7 +1065,7 @@ void gbWriteMemory(register uint16_t address, register uint8_t value)
gbTimerModeChange = (((value & 3) != (register_TAC & 3)) && (value & register_TAC & 4)) ? true : false; gbTimerModeChange = (((value & 3) != (register_TAC & 3)) && (value & register_TAC & 4)) ? true : false;
gbTimerOnChange = (((value ^ register_TAC) & 4) == 4) ? true : false; gbTimerOnChange = (((value ^ register_TAC) & 4) == 4) ? true : false;
gbTimerOn = (value & 4) ? true : false; gbTimerOn = (value & 4);
if (gbTimerOnChange || gbTimerModeChange) { if (gbTimerOnChange || gbTimerModeChange) {
gbTimerMode = value & 3; gbTimerMode = value & 3;
@ -2533,7 +2533,7 @@ void gbReset()
gbTimerModeChange = false; gbTimerModeChange = false;
gbTimerOnChange = false; gbTimerOnChange = false;
gbTimerOn = false; gbTimerOn = 0;
if (gbCgbMode) { if (gbCgbMode) {
for (i = 0; i < 0x20; i++) for (i = 0; i < 0x20; i++)
@ -2677,7 +2677,7 @@ void gbReset()
gbSerialBits = 0; gbSerialBits = 0;
gbSerialOn = 0; gbSerialOn = 0;
gbWindowLine = -1; gbWindowLine = -1;
gbTimerOn = false; gbTimerOn = 0;
gbTimerMode = 0; gbTimerMode = 0;
gbSpeed = 0; gbSpeed = 0;
gbJoymask[0] = gbJoymask[1] = gbJoymask[2] = gbJoymask[3] = 0; gbJoymask[0] = gbJoymask[1] = gbJoymask[2] = gbJoymask[3] = 0;