MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix _isMarioTennisScoreboard() hack for (E) version.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-04-27 16:40:32 +06:00
parent 08513ded89
commit e3d8905984
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/FrameBuffer.cpp
View File

@ -281,8 +281,12 @@ void FrameBufferList::setBufferChanged()
bool FrameBufferList::_isMarioTennisScoreboard()
{
if ((config.generalEmulation.hacks&hack_scoreboard) != 0)
return m_pCurrent != NULL && (m_pCurrent->m_startAddress == 0x13ba50 || m_pCurrent->m_startAddress == 0x264430);
if ((config.generalEmulation.hacks&hack_scoreboard) != 0) {
if (VI.PAL)
return m_pCurrent != NULL && (m_pCurrent->m_startAddress == 0x13b480 || m_pCurrent->m_startAddress == 0x26a530);
else
return m_pCurrent != NULL && (m_pCurrent->m_startAddress == 0x13ba50 || m_pCurrent->m_startAddress == 0x264430);
}
return (config.generalEmulation.hacks&hack_scoreboardJ) != 0 && m_pCurrent != NULL && (m_pCurrent->m_startAddress == 0x134080 || m_pCurrent->m_startAddress == 0x1332f8);
}

4
src/VI.cpp
View File

@ -49,8 +49,8 @@ void VI_UpdateSize()
} else if (hEnd != 0 && *REG.VI_WIDTH != 0)
VI.width = min((u32)floorf((hEnd - hStart)*xScale + 0.5f), *REG.VI_WIDTH);
const bool isPAL = (*REG.VI_V_SYNC & 0x3ff) > 550;
if (isPAL && (vEnd - vStart) > 478) {
VI.PAL = (*REG.VI_V_SYNC & 0x3ff) > 550;
if (VI.PAL && (vEnd - vStart) > 478) {
VI.height = (u32)(VI.real_height*1.0041841f);
if (VI.height > 576)
VI.height = VI.real_height = 576;

3
src/VI.h
View File

@ -8,10 +8,11 @@ struct VIInfo
f32 rwidth, rheight;
u32 lastOrigin;
bool interlaced;
bool PAL;
VIInfo() :
width(0), widthPrev(0), height(0), real_height(0),
lastOrigin(-1), interlaced(false)
lastOrigin(-1), interlaced(false), PAL(false)
{}
};