From cb265ae09ac6282b0a7282f3d3c0d5b5973cac08 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 5 Jul 2010 10:08:13 +0000
Subject: DS: Fix setShakePos

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

(limited to 'backends/platform/ds')

diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index b7f8b8caa3..556cfc3f43 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -264,7 +264,7 @@ static SpriteEntry spritesMain[128];
 static int tweak;
 
 // Shake
-static int shakePos = 0;
+static int s_shakePos = 0;
 
 // Keyboard
 static bool keyboardEnable = false;
@@ -1018,7 +1018,7 @@ void displayMode16BitFlipBuffer() {
 }
 
 void setShakePos(int shakePos) {
-	shakePos = shakePos;
+	s_shakePos = shakePos;
 }
 
 
@@ -2127,7 +2127,7 @@ void VBlankHandler(void) {
 		SUB_BG3_CX = subScX + 64;
 	}
 
-	SUB_BG3_CY = subScY + (shakePos << 8);*/
+	SUB_BG3_CY = subScY + (s_shakePos << 8);*/
 
 	/*SUB_BG3_XDX = (int) (subScreenWidth / 256.0f * 256);
 	SUB_BG3_XDY = 0;
@@ -2267,7 +2267,7 @@ void VBlankHandler(void) {
 			setZoomedScreenScale(subScreenWidth, ((subScreenHeight * (256 << 8)) / 192) >> 8);
 
 
-			setMainScreenScroll(scX << 8, (scY << 8) + (shakePos << 8));
+			setMainScreenScroll(scX << 8, (scY << 8) + (s_shakePos << 8));
 			setMainScreenScale(256, 256);		// 1:1 scale
 
 		} else {
@@ -2283,7 +2283,7 @@ void VBlankHandler(void) {
 			setZoomedScreenScroll(subScX, subScY, (subScreenWidth != 256) && (subScreenWidth != 128));
 			setZoomedScreenScale(subScreenWidth, ((subScreenHeight * (256 << 8)) / 192) >> 8);
 
-			setMainScreenScroll(64, (scY << 8) + (shakePos << 8));
+			setMainScreenScroll(64, (scY << 8) + (s_shakePos << 8));
 			setMainScreenScale(320, 256);		// 1:1 scale
 
 		}
-- 
cgit v1.2.3