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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat May 31 21:06:50 CEST 2008


Revision: 32430
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32430&view=rev
Author:   fingolfin
Date:     2008-05-31 12:06:50 -0700 (Sat, 31 May 2008)

Log Message:
-----------
DS: Fixed a warning; simplified & fixed the way scummvm_main gets invoked

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	2008-05-31 19:05:45 UTC (rev 32429)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2008-05-31 19:06:50 UTC (rev 32430)
@@ -2430,7 +2430,7 @@
 
 void* fastRamAlloc(int size) {
 //	return malloc(size);
-	void* result = fastRamPointer;
+	void* result = (void *) fastRamPointer;
 	fastRamPointer += size;
 	if(fastRamPointer > fastRamData + FAST_RAM_SIZE) {
 		consolePrintf("FastRam (ITCM) allocation failed!\n");
@@ -2824,33 +2824,25 @@
 	//printf("'%s'", Common::ConfigManager::kApplicationDomain.c_str());
 
 #if defined(DS_BUILD_A)
-	char* argv[2] = {"/scummvmds", "--config=scummvm.ini"};
+	const char *argv[] = {"/scummvmds"};
 #elif defined(DS_BUILD_B)
-	char* argv[2] = {"/scummvmds", "--config=scummvmb.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmb.ini"};
 #elif defined(DS_BUILD_C)
-	char* argv[2] = {"/scummvmds", "--config=scummvmc.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmc.ini"};
 #elif defined(DS_BUILD_D)
-	char* argv[3] = {"/scummvmds", "--config=scummvmd.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmd.ini"};
 #elif defined(DS_BUILD_E)
-	char* argv[3] = {"/scummvmds", "--config=scummvme.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvme.ini"};
 #elif defined(DS_BUILD_F)
-	char* argv[3] = {"/scummvmds", "--config=scummvmf.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmf.ini"};
 #elif defined(DS_BUILD_G)
-	char* argv[3] = {"/scummvmds", "--config=scummvmg.ini"};
+	const char *argv[] = {"/scummvmds", "--config=scummvmg.ini"};
 #endif
 
-#ifdef DS_NON_SCUMM_BUILD	
-
 	while (1) {
-		scummvm_main(2, (char **) &argv);
+		scummvm_main(ARRAYSIZE(argv), (char **) &argv);
 		powerOff();
 	}
-#else
-	while (1) {
-		scummvm_main(1, (char **) &argv);
-		powerOff();
-	}
-#endif
 
 	return 0;
 }


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