aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2008-05-31 19:06:50 +0000
committerMax Horn2008-05-31 19:06:50 +0000
commit0f64d7236c43ed1027439ee208bc394809d4ef15 (patch)
tree9e6d2f88470528f72ed88b59dd0d9ea36001caff
parent29cac0258f2d9825c9473c151e0ba1c40a5549f4 (diff)
downloadscummvm-rg350-0f64d7236c43ed1027439ee208bc394809d4ef15.tar.gz
scummvm-rg350-0f64d7236c43ed1027439ee208bc394809d4ef15.tar.bz2
scummvm-rg350-0f64d7236c43ed1027439ee208bc394809d4ef15.zip
DS: Fixed a warning; simplified & fixed the way scummvm_main gets invoked
svn-id: r32430
-rw-r--r--backends/platform/ds/arm9/source/dsmain.cpp26
1 files changed, 9 insertions, 17 deletions
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index c03a6b3e71..ab68df8f7a 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -2430,7 +2430,7 @@ u8 fastRamData[FAST_RAM_SIZE] ITCM_DATA;
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 @@ int main(void)
//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);
- powerOff();
- }
-#else
while (1) {
- scummvm_main(1, (char **) &argv);
+ scummvm_main(ARRAYSIZE(argv), (char **) &argv);
powerOff();
}
-#endif
return 0;
}