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

RC: Merged unbroken SPR fix, and set the version number back. ;) 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/rc_0.9.6@613 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-02-26 12:41:40 +00:00
parent b8011af5ea
commit 99945e0f27
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Common.h
View File

@ -75,6 +75,6 @@ extern TESTRUNARGS g_TestRun;
//#include "Misc.h"
#include "Patch.h"
#define PCSX2_VERSION "(beta)"
#define PCSX2_VERSION "0.9.6"
#endif /* __COMMON_H__ */

14
pcsx2/SPR.cpp
View File

@ -270,12 +270,11 @@ void dmaSPR0() { // fromSPR
SPR_LOG("dmaSPR0 chcr = %lx, madr = %lx, qwc = %lx, sadr = %lx\n",
spr0->chcr, spr0->madr, spr0->qwc, spr0->sadr);
if ((spr0->chcr & 0xc) == 0x4){
if ((spr0->chcr & 0xc) == 0x4 && spr0->qwc == 0){
u32 *ptag;
ptag = (u32*)&PS2MEM_SCRATCH[spr0->sadr & 0x3fff]; //Set memory pointer to SADR
spr0->qwc = (u16)ptag[0]; //QWC set to lower 16bits of the tag
CPU_INT(8, spr0->qwc / BIAS);
spr0->qwc = 0;
CPU_INT(8, (ptag[0] & 0xffff) / BIAS);
// spr0->qwc = 0;
return;
}
// COMPLETE HACK!!! For now at least.. FFX Videos dont rely on interrupts or reading DMA values
@ -429,12 +428,11 @@ void dmaSPR1() { // toSPR
spr1->tadr, spr1->sadr);
#endif
if ((spr1->chcr & 0xc) == 0x4){
if ((spr1->chcr & 0xc) == 0x4 && spr1->qwc == 0){
u32 *ptag;
ptag = (u32*)dmaGetAddr(spr1->tadr); //Set memory pointer to TADR
spr1->qwc = (u16)ptag[0]; //QWC set to lower 16bits of the tag
CPU_INT(9, spr1->qwc / BIAS);
spr1->qwc = 0;
CPU_INT(9, (ptag[0] & 0xffff) / BIAS);
//spr1->qwc = 0;
return;
}
// COMPLETE HACK!!! For now at least.. FFX Videos dont rely on interrupts or reading DMA values