[Desmume-cvs] SF.net SVN: desmume:[3667] trunk/desmume/src

[<ze...@us...>]

Revision: 3667
          http://desmume.svn.sourceforge.net/desmume/?rev=3667&view=rev
Author:   zeromus
Date:     2010-06-17 05:24:35 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
add --gbaslot-rom=self special value which mounts the current nds rom as a gba game, and fix the win32 cflash configuration dialog

Modified Paths:
--------------
    trunk/desmume/src/addons/gbagame.cpp
    trunk/desmume/src/windows/gbaslot_config.cpp

Modified: trunk/desmume/src/addons/gbagame.cpp
===================================================================
--- trunk/desmume/src/addons/gbagame.cpp	2010-06-16 20:48:26 UTC (rev 3666)
+++ trunk/desmume/src/addons/gbagame.cpp	2010-06-17 05:24:35 UTC (rev 3667)
@@ -22,6 +22,7 @@
 #include "../mem.h"
 #include <string.h>
 #include "../MMU.h"
+#include "path.h"
 
 //SRAM is going to be stored just above the rom.
 //that is convenient for us, since it mirrors the nds memory map
@@ -292,6 +293,12 @@
 	if (!strlen(GBAgameName)) return;
 	FILE *fgame = 0;
 
+	//perk: if the gbagame name is "self" this is a special indicator that we should mount the main rom that we're running as the gba game
+	if(!stricmp(GBAgameName,"self"))
+	{
+		strcpy(GBAgameName,path.path.c_str());
+	}
+
 	fgame = fopen(GBAgameName,"rb");
 	if (!fgame) return;
 	fseek(fgame, 0, SEEK_END);

Modified: trunk/desmume/src/windows/gbaslot_config.cpp
===================================================================
--- trunk/desmume/src/windows/gbaslot_config.cpp	2010-06-16 20:48:26 UTC (rev 3666)
+++ trunk/desmume/src/windows/gbaslot_config.cpp	2010-06-17 05:24:35 UTC (rev 3667)
@@ -554,11 +554,10 @@
 				break;
 			case NDS_ADDON_CFLASH:
 				//save current values for win32 configuration
-				//(no tmp for mode, a little weird but thats just how it evolved)
-				win32_CFlash_cfgMode = CFlash_Mode;
+				win32_CFlash_cfgMode = tmp_CFlashMode;
 				win32_CFlash_cfgDirectory = tmp_cflash_path;
 				win32_CFlash_cfgFileName = tmp_cflash_filename;
-				WritePrivateProfileInt("GBAslot.CFlash","fileMode",CFlash_Mode,IniName);
+				WritePrivateProfileInt("GBAslot.CFlash","fileMode",tmp_CFlashMode,IniName);
 				WritePrivateProfileString("GBAslot.CFlash","path",tmp_cflash_path,IniName);
 				WritePrivateProfileString("GBAslot.CFlash","filename",tmp_cflash_filename,IniName);
 


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