[Scummvm-cvs-logs] SF.net SVN: scummvm:[41150] scummvm/trunk/backends/platform/ds

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Jun 3 22:48:36 CEST 2009


Revision: 41150
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41150&view=rev
Author:   fingolfin
Date:     2009-06-03 20:48:35 +0000 (Wed, 03 Jun 2009)

Log Message:
-----------
cleanup

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

Modified: scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm7/source/main.cpp	2009-06-03 20:03:08 UTC (rev 41149)
+++ scummvm/trunk/backends/platform/ds/arm7/source/main.cpp	2009-06-03 20:48:35 UTC (rev 41150)
@@ -585,7 +585,7 @@
 
   //enable sound
 //  powerOn(POWER_SOUND);
-  SOUND_CR = SOUND_ENABLE | SOUND_VOL(0x7F);
+  REG_SOUNDCNT = SOUND_ENABLE | SOUND_VOL(0x7F);
   IPC->soundData = 0;
   IPC->reset = false;
 

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2009-06-03 20:03:08 UTC (rev 41149)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2009-06-03 20:48:35 UTC (rev 41150)
@@ -619,25 +619,17 @@
 	SUB_BG3_CR = BG_BMP8_512x256;
 
 	SUB_BG3_XDX = (int) (subScreenWidth / 256.0f * 256);
-    	SUB_BG3_XDY = 0;
-    	SUB_BG3_YDX = 0;
+	SUB_BG3_XDY = 0;
+	SUB_BG3_YDX = 0;
 	SUB_BG3_YDY = (int) (subScreenHeight / 192.0f * 256);
 
 
 
-	if (consoleEnable)
-	{
+	if (consoleEnable) {
 		consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 2, 0, true);
-
 		// Move the cursor to the bottom of the screen using ANSI escape code
 		consolePrintf("\033[23;0f");
 	}
-//	consoleInitDefault((u16*)SCREEN_BASE_BLOCK(2), (u16*)CHAR_BASE_BLOCK(0), 16);
-//	consoleSetWindow(NULL, 0, 0, 32, 24);
-//	consolePrintSet(0, 23);
-/*	while (1) {
-		printf("Hello world");
-	}*/
 
 
 	for (int r = 0; r < 32 * 32; r++) {
@@ -660,9 +652,6 @@
 //	PALETTE_SUB[255] = savedPalEntry255;
 
 
-
-
-
 	#ifdef HEAVY_LOGGING
 	consolePrintf("done\n");
 	#endif
@@ -1564,10 +1553,6 @@
 					}
 
 				}
-
-
-
-
 			}
 
 
@@ -1593,8 +1578,6 @@
 					showOptionsDialog();
 				}
 			}
-
-
 		}
 
 		if (!getIndyFightState() && !((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) && (getKeysDown() & KEY_X)) {
@@ -1608,12 +1591,9 @@
 
 		if (!keyboardEnable) {
 
-			if ((tapScreenClicks) && (getIsDisplayMode8Bit()))
-			{
+			if ((tapScreenClicks) && (getIsDisplayMode8Bit())) {
 				doScreenTapMode(system);
-			}
-			else
-			{
+			} else {
 				doButtonSelectMode(system);
 			}
 


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




More information about the Scummvm-git-logs mailing list