From cebefa61304f92e2ed328f4da21b6e31e4d22c7f Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 19 Nov 2009 02:39:29 +0000 Subject: [PATCH] Fix iso loading. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2219 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CDVD/IsoFileFormats.cpp | 4 ++-- pcsx2/VU0micro.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcsx2/CDVD/IsoFileFormats.cpp b/pcsx2/CDVD/IsoFileFormats.cpp index 996c517b8f..d424c95cf8 100644 --- a/pcsx2/CDVD/IsoFileFormats.cpp +++ b/pcsx2/CDVD/IsoFileFormats.cpp @@ -356,7 +356,7 @@ int _isoReadBlockM(isoFile *iso, u8 *dst, uint lsn) int isoReadBlock(isoFile *iso, u8 *dst, uint lsn) { - uint ret; + int ret; if (lsn > iso->blocks) { @@ -373,7 +373,7 @@ int isoReadBlock(isoFile *iso, u8 *dst, uint lsn) else ret = _isoReadBlock(iso, dst, lsn); - if (ret < lsn) return -1; + if (ret < 0) return -1; if (iso->type == ISOTYPE_CD) { diff --git a/pcsx2/VU0micro.cpp b/pcsx2/VU0micro.cpp index 4942c31c07..3dac499875 100644 --- a/pcsx2/VU0micro.cpp +++ b/pcsx2/VU0micro.cpp @@ -54,7 +54,7 @@ void __fastcall vu0ExecMicro(u32 addr) { VU0.VI[REG_VPU_STAT].UL&= ~0xAE; // If an unsigned variable isn't -1? --arcum42 - /*if (addr != -1) */VU0.VI[REG_TPC].UL = addr; + if (addr != (u32)-1) VU0.VI[REG_TPC].UL = addr; _vuExecMicroDebug(VU0); CpuVU0.ExecuteBlock();