DS: Merging accross changes from branch1-0-0 into trunk.

svn-id: r48136

1 files changed, 12 insertions, 2 deletions

diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 8ea9b06b23..111f3a888b 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -60,6 +60,12 @@
 #define DEFAULT_CONFIG_FILE "scummvmg.ini"
 #elif defined(DS_BUILD_H)
 #define DEFAULT_CONFIG_FILE "scummvmh.ini"
+#elif defined(DS_BUILD_I)
+#define DEFAULT_CONFIG_FILE "scummvmi.ini"
+#elif defined(DS_BUILD_J)
+#define DEFAULT_CONFIG_FILE "scummvmj.ini"
+#elif defined(DS_BUILD_K)
+#define DEFAULT_CONFIG_FILE "scummvmk.ini"
 #endif
 
 OSystem_DS* OSystem_DS::_instance = NULL;
@@ -177,7 +183,7 @@ void OSystem_DS::setPalette(const byte *colors, uint start, uint num) {
 		green >>= 3;
 		blue >>= 3;
 
-		//if (r != 255)
+//		if (r != 255)
 		{
 			u16 paletteValue = red | (green << 5) | (blue << 10);
 
@@ -265,12 +271,13 @@ void OSystem_DS::grabPalette(unsigned char *colours, uint start, uint num) {
 #define MISALIGNED16(ptr) (((u32) (ptr) & 1) != 0)
 
 void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
-	//consolePrintf("Copy rect %d, %d   %d, %d ", x, y, w, h);
 	if (!_graphicsEnable) return;
 	if (w <= 1) return;
 	if (h < 0) return;
 	if (!DS::getIsDisplayMode8Bit()) return;
 
+//	consolePrintf("CopyRectToScreen %d\n", w * h);
+
 	u16* bg;
 	s32 stride;
 	u16* bgSub = (u16 *)BG_GFX_SUB;
@@ -452,6 +459,8 @@ void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 }
 
 void OSystem_DS::updateScreen() {
+	static int cnt = 0;
+//	consolePrintf("updatescr %d\n", cnt++);
 
 	if ((_frameBufferExists) && (DS::getIsDisplayMode8Bit())) {
 		_frameBufferExists = false;
@@ -883,6 +892,7 @@ u16 OSystem_DS::applyGamma(u16 colour) {
 void OSystem_DS::engineDone() {
 	// Scumm games appear not to stop their CD audio, so I stop the CD here.
 	stopCD();
+	DS::exitGame();
 
 #ifdef ENABLE_AGI
 	DS::clearAutoCompleteWordList();