Merge remote branch 'upstream/master' into pegasus

6 files changed, 16 insertions, 12 deletions

diff --git a/backends/platform/ds/arm9/dist/readme_ds.txt b/backends/platform/ds/arm9/dist/readme_ds.txt
index ee1db719f4..24c85ad556 100644
--- a/backends/platform/ds/arm9/dist/readme_ds.txt
+++ b/backends/platform/ds/arm9/dist/readme_ds.txt
@@ -679,7 +679,7 @@ not supported.
 
 Cdex can do the conversion very well and I recommend using it to convert
 your audio files, although any CD ripping software can be used, so feel
-free to use your favourite program. The format you need to use is
+free to use your favorite program. The format you need to use is
 IMA-ADPCM 4-bit Mono. You may use any sample rate. All other formats
 will be rejected, including uncompressed WAV files.
 
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 781738265c..1b21b41a9b 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -75,7 +75,7 @@ else
 			ifdef DS_BUILD_K
 
 			else
-		#		USE_MAD = 1
+				USE_MAD = 1
 			endif
 		endif
 	endif
@@ -245,7 +245,9 @@ ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
 
-DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU
+DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE_FOR_DEBUGGER -DDISABLE_MASS_ADD -DDISABLE_NES_APU
+# for release builds:
+#DEFINES +=  -DNDEBUG
 
 LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
 
@@ -259,7 +261,7 @@ BACKEND := ds
 INCLUDES= -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/engines \
 			-I$(portdir)/data -I$(portdir)/../commoninclude \
 			-I$(portdir)/source -I$(portdir)/source/mad \
-			-I$(libndsdir)/include -include $(srcdir)/common/scummsys.h
+			-I$(libndsdir)/include -include $(portdir)/source/portdefs.h
 
 
 LIBS	= -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 3fa4a0283a..dfd906d816 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -68,8 +68,7 @@
 // - Try discworld?
 
 
-// Disable symbol overrides for FILE
-#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 
 
@@ -576,7 +575,7 @@ void initGame() {
 		for (int r = 0; r < NUM_SUPPORTED_GAMES; r++) {
 			if (!stricmp(gameName, gameList[r].gameId)) {
 				s_currentGame = &gameList[r];
-	//			consolePrintf("Game list num: %d\n", s_currentGame);
+	//			consolePrintf("Game list num: %d\n", r);
 			}
 		}
 	}
@@ -1669,8 +1668,7 @@ void addEventsToQueue() {
 
 
 		if (!keyboardEnable) {
-
-			if ((isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
+			if ((!isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
 				// Controls specific to the control method
 
 				if (s_currentGame->control == CONT_SKY) {
diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
index 698590418c..76508a1664 100644
--- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
+++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
@@ -1010,7 +1010,7 @@ DIR_ENT FAT_GetDirEntry ( u32 dirCluster, int entry, int origin)
 	dir.name[0] = FILE_FREE; // default to no file found
 	dir.attrib = 0x00;
 
-	// Check if fat has been initialised
+	// Check if fat has been initialized
 	if (filesysBytePerSec == 0)
 	{
 		return (dir);
diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h
index 580eb680eb..f512ce3ea2 100644
--- a/backends/platform/ds/arm9/source/portdefs.h
+++ b/backends/platform/ds/arm9/source/portdefs.h
@@ -26,8 +26,11 @@
 // Include ndstypes.h for uint16 etc. typedefs
 #include "nds/ndstypes.h"
 
-// Somebody removed these from scummsys.h, but they're still required, so I'm
-// adding them here in the hope that they'll stay.
+// Define SCUMMVM_DONT_DEFINE_TYPES to prevent scummsys.h from trying to
+// re-define those data types.
+#define SCUMMVM_DONT_DEFINE_TYPES
+
+// Include required headers
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp
index 392a186e79..49552a86b2 100644
--- a/backends/platform/ds/arm9/source/zipreader.cpp
+++ b/backends/platform/ds/arm9/source/zipreader.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "common/scummsys.h"
 #include "zipreader.h"