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

bring branches into line 

fixes duke nukem on bgk-link and silences gcc warning on trunk
ignore a few more files
This commit is contained in:
squall-leonhart 2013-05-04 15:31:45 +00:00
parent e4dde67e52
commit 6277cae2a9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gb/GB.cpp
View File

@ -4827,6 +4827,7 @@ void gbEmulate(int ticksToStop)
wx = 0;
if((wx <= 159) && (tempgbWindowLine <= 143))
{
for (int i = wx; i<300; i++)
if (gbSpeed)
gbSpritesTicks[i]+=3;
@ -4835,6 +4836,7 @@ void gbEmulate(int ticksToStop)
}
}
}
}
gbInt48Signal &= ~7;

2
src/gb/gbGfx.cpp
View File

@ -234,7 +234,7 @@ void gbRenderLine()
if(y >= inUseRegister_WY) {
if ((gbWindowLine>144))
if (gbWindowLine>143)
gbWindowLine = 0;
int wx = register_WX;