diff options
author | Kamil Zbróg | 2014-01-12 18:44:51 +0000 |
---|---|---|
committer | Kamil Zbróg | 2014-01-12 18:44:51 +0000 |
commit | 444934a0accec982f55db92c17ef65270fe18e66 (patch) | |
tree | f62210b1ff15696accd87d97b68b03688a153156 /backends/platform/dc/dcmain.cpp | |
parent | e94fabc37407a7d300af04493b0f5cbced42a092 (diff) | |
parent | 1a4f951f8bff52f6185304722f2ab9cf9bcd58f4 (diff) | |
download | scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.tar.gz scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.tar.bz2 scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.zip |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'backends/platform/dc/dcmain.cpp')
-rw-r--r-- | backends/platform/dc/dcmain.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index bec1fdae3a..36a22c4b5c 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -79,13 +79,14 @@ static bool find_track(int track, int &first_sec, int &last_sec) if (first < 1 || last > 99 || first > last) return false; for (i=first; i<=last; i++) - if (!(TOC_CTRL(toc->entry[i-1])&4)) + if (!(TOC_CTRL(toc->entry[i-1])&4)) { if (track==1) { first_sec = TOC_LBA(toc->entry[i-1]); last_sec = TOC_LBA(toc->entry[i]); return true; } else --track; + } return false; } @@ -281,7 +282,7 @@ namespace DC_Flash { if((r = syscall_read_flash(info[0] + (bmb++ << 6), bm, 64))<0) return r; } - if(!(bm[(b>>3)&63] & (0x80>>(b&7)))) + if(!(bm[(b>>3)&63] & (0x80>>(b&7)))) { if((r = syscall_read_flash(info[0] + ((b+1) << 6), buf, 64))<0) return r; else if((s=*(unsigned short *)(buf+0)) == sec && @@ -289,6 +290,7 @@ namespace DC_Flash { memcpy(dst+(s-sec)*60, buf+2, 60); got=1; } + } } return got; } |