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

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1197 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
squall-leonhart 2013-05-04 15:31:45 +00:00
parent 2223d4f982
commit f801761eca
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,11 +4827,13 @@ void gbEmulate(int ticksToStop)
wx = 0; wx = 0;
if((wx <= 159) && (tempgbWindowLine <= 143)) if((wx <= 159) && (tempgbWindowLine <= 143))
{
for (int i = wx; i<300; i++) for (int i = wx; i<300; i++)
if (gbSpeed) if (gbSpeed)
gbSpritesTicks[i]+=3; gbSpritesTicks[i]+=3;
else else
gbSpritesTicks[i]+=1; gbSpritesTicks[i]+=1;
}
} }
} }
} }

2
src/gb/gbGfx.cpp
View File

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