From 64da7dd76b95a09668f077cbad7ad1205be1646c Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 25 Apr 2010 19:52:33 +0000 Subject: [PATCH] zzogl-pg: Remove a few hardcoded game options that shouldn't be there. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2903 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/zerogs.cpp | 21 +++++++++-------- plugins/zzogl-pg/opengl/zerogs.h | 37 +++++++++++++++++++----------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/plugins/zzogl-pg/opengl/zerogs.cpp b/plugins/zzogl-pg/opengl/zerogs.cpp index 272c28c295..f0439d72dc 100644 --- a/plugins/zzogl-pg/opengl/zerogs.cpp +++ b/plugins/zzogl-pg/opengl/zerogs.cpp @@ -541,7 +541,7 @@ void ZeroGS::Restore() __forceinline void MOVZ(VertexGPU *p, u32 gsz, const VB& curvb) { - p->z = curvb.zprimmask==0xffff?min((u32)0xffff, gsz):gsz; + p->z = (curvb.zprimmask==0xffff) ? min((u32)0xffff, gsz) : gsz; } __forceinline void MOVFOG(VertexGPU *p, Vertex gsf) @@ -554,20 +554,23 @@ int Values[100]={0,}; __forceinline void SET_VERTEX(VertexGPU *p, int Index, const VB& curvb) { int index = Index; + p->x = (((int)gs.gsvertex[index].x - curvb.offset.x >> 1) & 0xffff); + p->y = (((int)gs.gsvertex[index].y - curvb.offset.y >> 1) & 0xffff); + +#ifdef LSD_MODE + int diffX = (int)gs.gsvertex[index].x - curvb.offset.x; + int diffY = (int)gs.gsvertex[index].y - curvb.offset.y; + + if (diffX < 0) { p->x = - p->x; } + if (diffY < 0) { p->y = - p->y; } +#endif - p->x = (((int)gs.gsvertex[index].x - curvb.offset.x)>>1)&0xffff; - p->y = (((int)gs.gsvertex[index].y - curvb.offset.y)>>1)&0xffff; - - /*x = ((int)gs.gsvertex[index].x - curvb.offset.x); - y = ((int)gs.gsvertex[index].y - curvb.offset.y); - p.x = (x&0x7fff) | (x < 0 ? 0x8000 : 0); - p.y = (y&0x7fff) | (y < 0 ? 0x8000 : 0);*/ p->f = ((s16)gs.gsvertex[index].f<<7)|0x7f; MOVZ(p, gs.gsvertex[index].z, curvb); p->rgba = prim->iip ? gs.gsvertex[index].rgba : gs.rgba; -// This code is somehow icorrect +// This code is somehow incorrect // if ((gs.texa.aem) && ((p->rgba & 0xffffff ) == 0)) // p->rgba = 0; diff --git a/plugins/zzogl-pg/opengl/zerogs.h b/plugins/zzogl-pg/opengl/zerogs.h index abce69ebf5..2d7372d436 100644 --- a/plugins/zzogl-pg/opengl/zerogs.h +++ b/plugins/zzogl-pg/opengl/zerogs.h @@ -531,6 +531,9 @@ enum GAME_HACK_OPTIONS AtelierIris1, AtelierIris2, AtelierIris3, + AtelierJudie, + AtelierLilie, + AtelierViorate, ArTonelico1, ArTonelico2, ManaKhemia1, @@ -593,21 +596,27 @@ enum GAME_HACK_OPTIONS //{0x0B82BFF7, GodOfWar2, Unknown_Region, GAME_FULL16BITRES, -1, -1}, {0xF0A6D880, HarvestMoon, US, GAME_NOSTENCIL, -1, -1}, - {0xFB236A46, SonicUnleashed, US, GAME_FASTUPDATE | GAME_NOALPHAFAIL /**/ | GAME_GUSTHACK | GAME_NOTARGETRESOLVE /**/, -1, -1}, - {0xa5d29941, ShadowTheHedgehog, US, GAME_FASTUPDATE | GAME_NOALPHAFAIL /**/ | GAME_GUSTHACK | GAME_NOTARGETRESOLVE /**/, -1, -1}, + //{0x304C115C, HarvestMoon, Unknown, GAME_NOSTENCIL, -1, -1}, + {0xFB236A46, SonicUnleashed, US, GAME_FASTUPDATE | GAME_NOALPHAFAIL, -1, -1}, + {0xa5d29941, ShadowTheHedgehog, US, GAME_FASTUPDATE | GAME_NOALPHAFAIL, -1, -1}, - {0x7acf7e03, AtelierIris1, Unknown_Region, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - {0xE3981DBB, AtelierIris1, US, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - {0x9AC65D6A, AtelierIris2, US, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - {0x4CCC9212, AtelierIris3, US, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - //{0x4437F4B1, ArTonelico1, US, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - {0xF95F37EE, ArTonelico2, US, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - {0xF46142D3, ArTonelico2, JPUNDUB, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - {0x77b0236f, ManaKhemia1, US, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, - {0x433951e7, ManaKhemia2, Unknown_Region, GAME_GUSTHACK /**/| GAME_NOTARGETRESOLVE | GAME_NOALPHAFAIL/**/, -1, -1}, + {0x7acf7e03, AtelierIris1, Unknown_Region, GAME_GUSTHACK, -1, -1}, + {0xF0457CEF, AtelierIris1, Unknown_Region, GAME_GUSTHACK, -1, -1}, + {0xE3981DBB, AtelierIris1, US, GAME_GUSTHACK, -1, -1}, + {0x9AC65D6A, AtelierIris2, US, GAME_GUSTHACK, -1, -1}, + {0x4CCC9212, AtelierIris3, US, GAME_GUSTHACK, -1, -1}, + {0xCA295E61, AtelierIris3, JP, GAME_GUSTHACK, -1, -1}, + //{0x4437F4B1, ArTonelico1, US, GAME_GUSTHACK, -1, -1}, + {0xF95F37EE, ArTonelico2, US, GAME_GUSTHACK, -1, -1}, + {0xF46142D3, ArTonelico2, JPUNDUB, GAME_GUSTHACK, -1, -1}, + {0x77b0236f, ManaKhemia1, US, GAME_GUSTHACK , -1, -1}, + {0x433951e7, ManaKhemia2, US, GAME_GUSTHACK, -1, -1}, + //{0xda11c6d4, AtelierJudie, JP, GAME_GUSTHACK, -1, -1}, + //{0x3e72c085, AtelierLilie, JP, GAME_GUSTHACK, -1, -1}, + //{0x6eac076b, AtelierViorate, JP, GAME_GUSTHACK, -1, -1}, - {0xbaa8dd8, DarkCloud1, US, GAME_NOTARGETRESOLVE /**/| GAME_NOALPHAFAIL/**/, -1, -1}, - {0xA5C05C78, DarkCloud1, Unknown_Region, GAME_NOTARGETRESOLVE /**/| GAME_NOALPHAFAIL/**/, -1, -1}, + {0xbaa8dd8, DarkCloud1, US, GAME_NOTARGETRESOLVE, -1, -1}, + {0xA5C05C78, DarkCloud1, Unknown_Region, GAME_NOTARGETRESOLVE, -1, -1}, //{0x1DF41F33, DarkCloud2, US, 0, -1, -1}, {0x95cc86ef, GhostInTheShell, Unknown_Region, GAME_NOALPHAFAIL, -1, -1} @@ -1039,7 +1048,7 @@ namespace ZeroGS { void StopCapture(); void CaptureFrame(); - // Perform clutting for flushed texture. Better check if it need prior call + // Perform clutting for flushed texture. Better check if it needs a prior call. inline void CluttingForFlushedTex(tex0Info* tex0, u32 Data, int ictx) { tex0->cbp = ZZOglGet_cbp_TexBits(Data);