From e5107cb9807b884e8b84ff25733d60575902039d Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Sun, 17 Jun 2007 19:37:07 +0000
Subject: NDS: setKeyboardEnable shouldn't overrun VRAM anymore when CPU scaler
 is on

svn-id: r27515
---
 backends/platform/ds/arm9/source/dsmain.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'backends/platform/ds/arm9')

diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 644b66671a..45f0a16deb 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -1018,11 +1018,19 @@ void setKeyboardEnable(bool en) {
 			// Copy the sub screen VRAM from the top screen - they should always be
 			// the same.
 			u16* buffer = get8BitBackBuffer();
-
-			for (int r = 0; r < (512 * 256) >> 1; r++) {
-				BG_GFX_SUB[r] = buffer[r];
-			}
-			
+            
+            if(isCpuScalerEnabled())
+            {
+                for (int y = 0; y < gameHeight; ++y)
+                    for (int x = 0; x < gameWidth / 2; ++x)
+                        BG_GFX_SUB[y*256 + x] = buffer[y*gameWidth/2 + x];
+            }
+            else
+            {
+                for (int r = 0; r < (512 * 256) >> 1; r++) {
+                    BG_GFX_SUB[r] = buffer[r];
+                }
+            }			
 			SUB_DISPLAY_CR &= ~DISPLAY_BG1_ACTIVE;	// Turn off keyboard layer
 			SUB_DISPLAY_CR |= DISPLAY_BG3_ACTIVE;	// Turn on game layer
 		} else {
-- 
cgit v1.2.3