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

cdvdGigaherz: Use booleans instead of ints to represent conditionals in CDVD.cpp

This commit is contained in:
Lioncash 2014-07-15 17:06:49 -04:00
parent 69f57351b2
commit c2e96a081f
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/cdvdGigaherz/src/CDVD.cpp
View File

@ -132,15 +132,13 @@ void __inline lba_to_msf(s32 lba, u8* m, u8* s, u8* f) {
char csrc[20];
BOOL cdvd_is_open=FALSE;
BOOL cdvdKeepAlive_is_open = false;
bool cdvd_is_open = false;
bool cdvdKeepAlive_is_open = false;
bool disc_has_changed = false;
bool weAreInNewDiskCB = false;
Source *src;
s32 disc_has_changed=0;
int weAreInNewDiskCB=0;
char bfr[2352];
char throwaway[2352];
extern s32 prefetch_last_lba;

9
plugins/cdvdGigaherz/src/CDVD.h
View File

@ -160,14 +160,13 @@ void WriteSettings();
void CfgSetSettingsDir( const char* dir );
extern char csrc[];
extern BOOL cdvd_is_open;
extern BOOL cdvdKeepAlive_is_open;
extern int weAreInNewDiskCB;
extern bool cdvd_is_open;
extern bool cdvdKeepAlive_is_open;
extern bool disc_has_changed;
extern bool weAreInNewDiskCB;
extern void (*newDiscCB)();
extern s32 disc_has_changed;
s32 cdvdStartThread();
void cdvdStopThread();
s32 cdvdRequestSector(u32 sector, s32 mode);

16
plugins/cdvdGigaherz/src/ReadThread.cpp
View File

@ -110,9 +110,9 @@ void cdvdCacheReset()
void cdvdCallNewDiscCB()
{
weAreInNewDiskCB=1;
weAreInNewDiskCB = true;
newDiscCB();
weAreInNewDiskCB=0;
weAreInNewDiskCB = false;
}
bool cdvdUpdateDiscStatus()
@ -140,9 +140,9 @@ bool cdvdUpdateDiscStatus()
{
if(!disc_has_changed)
{
disc_has_changed=1;
curDiskType=CDVD_TYPE_NODISC;
curTrayStatus=CDVD_TRAY_OPEN;
disc_has_changed = true;
curDiskType = CDVD_TYPE_NODISC;
curTrayStatus = CDVD_TRAY_OPEN;
cdvdCallNewDiscCB();
}
}
@ -150,13 +150,13 @@ bool cdvdUpdateDiscStatus()
{
if(disc_has_changed)
{
curDiskType=CDVD_TYPE_NODISC;
curTrayStatus=CDVD_TRAY_CLOSE;
curDiskType = CDVD_TYPE_NODISC;
curTrayStatus = CDVD_TRAY_CLOSE;
// just a test
src->Reopen();
disc_has_changed=0;
disc_has_changed = false;
cdvdRefreshData();
cdvdCallNewDiscCB();
}