[Scummvm-cvs-logs] SF.net SVN: scummvm:[43496] scummvm/branches/branch-1-0-0/backends/platform /ds/arm9/source

[agent-q at users.sourceforge.net]

Revision: 43496
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43496&view=rev
Author:   agent-q
Date:     2009-08-17 21:27:57 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
DS:
- Correctly initialise mouse mode
- Stop the CD audio when the engine quits.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp
    scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp
    scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.h

Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp	2009-08-17 21:01:19 UTC (rev 43495)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp	2009-08-17 21:27:57 UTC (rev 43496)
@@ -248,7 +248,7 @@
 bool isCpuScalerEnabled();
 //#define HEAVY_LOGGING
 
-MouseMode mouseMode;
+MouseMode mouseMode = MOUSE_LEFT;
 
 int storedMouseX = 0;
 int storedMouseY = 0;

Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp	2009-08-17 21:01:19 UTC (rev 43495)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp	2009-08-17 21:27:57 UTC (rev 43496)
@@ -837,13 +837,13 @@
 
 Common::SeekableReadStream* OSystem_DS::createConfigReadStream() {
 	Common::FSNode file(DEFAULT_CONFIG_FILE);
-	consolePrintf("R %s", DEFAULT_CONFIG_FILE);
+//	consolePrintf("R %s", DEFAULT_CONFIG_FILE);
 	return file.createReadStream();
 }
 
 Common::WriteStream* OSystem_DS::createConfigWriteStream() {
 	Common::FSNode file(DEFAULT_CONFIG_FILE);
-	consolePrintf("W %s", DEFAULT_CONFIG_FILE);
+//	consolePrintf("W %s", DEFAULT_CONFIG_FILE);
 	return file.createWriteStream();
 }
 
@@ -873,6 +873,9 @@
 	return 0x8000 | r | (g << 5) | (b << 10);
 }
 
+void OSystem_DS::engineDone() {
+	// Scumm games appear not to stop their CD audio, so I stop the CD here.
+	stopCD();
+}
 
 
-

Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.h	2009-08-17 21:01:19 UTC (rev 43495)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.h	2009-08-17 21:27:57 UTC (rev 43496)
@@ -179,6 +179,8 @@
 
 	u16 applyGamma(u16 colour);
 	void setGammaValue(int gamma) { _gammaValue = gamma; }
+
+	void engineDone();
 };
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {


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