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

src/gb/GB.cpp

@@ -4827,11 +4827,13 @@ void gbEmulate(int ticksToStop)
                         wx = 0;
 
                     if((wx <= 159) && (tempgbWindowLine <= 143))
+                    {
                       for (int i = wx; i<300; i++)
                         if (gbSpeed)
                           gbSpritesTicks[i]+=3;
                         else
                           gbSpritesTicks[i]+=1;
+                    }
                   }
                 }
               }

src/gb/gbGfx.cpp

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