From 6277cae2a902623ede619be761f06e176069d17f Mon Sep 17 00:00:00 2001
From: squall-leonhart <squall-leonhart@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Sat, 4 May 2013 15:31:45 +0000
Subject: [PATCH] bring branches into line fixes duke nukem on bgk-link and
 silences gcc warning on trunk ignore a few more files

---
 src/gb/GB.cpp    | 2 ++
 src/gb/gbGfx.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gb/GB.cpp b/src/gb/GB.cpp
index db68076d..c7176869 100644
--- a/src/gb/GB.cpp
+++ b/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;
+                    }
                   }
                 }
               }
diff --git a/src/gb/gbGfx.cpp b/src/gb/gbGfx.cpp
index b2e0ecbd..a197405f 100644
--- a/src/gb/gbGfx.cpp
+++ b/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;