[Scummvm-cvs-logs] SF.net SVN: scummvm:[50674] scummvm/trunk/backends/platform/ds/arm9/source/ dsmain.cpp

[fingolfin at users.sourceforge.net]

Revision: 50674
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50674&view=rev
Author:   fingolfin
Date:     2010-07-05 10:08:13 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
DS: Fix setShakePos

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2010-07-05 10:07:54 UTC (rev 50673)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2010-07-05 10:08:13 UTC (rev 50674)
@@ -264,7 +264,7 @@
 static int tweak;
 
 // Shake
-static int shakePos = 0;
+static int s_shakePos = 0;
 
 // Keyboard
 static bool keyboardEnable = false;
@@ -1018,7 +1018,7 @@
 }
 
 void setShakePos(int shakePos) {
-	shakePos = shakePos;
+	s_shakePos = shakePos;
 }
 
 
@@ -2127,7 +2127,7 @@
 		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 @@
 			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 @@
 			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
 
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.