Check SDK version for ROM in argv/launcharg

Author: RocketRobz

romsel_dsimenutheme/arm9/source/fileBrowse.cpp

@@ -1110,7 +1110,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 			&& (isDirectory[cursorPosition] == false) && (bnrRomType[cursorPosition] == 0) && (isHomebrew[cursorPosition] == false)
 			&& !titleboxXmoveleft && !titleboxXmoveright && showSTARTborder)
 			{
-				perGameSettings(dirContents[scrn].at(cursorPosition+pagenum*40).name, username);
+				perGameSettings(dirContents[scrn].at(cursorPosition+pagenum*40).name);
 			}
 
 		}

romsel_dsimenutheme/arm9/source/perGameSettings.cpp

@@ -108,7 +108,7 @@ void savePerGameSettings (std::string filename) {
 	pergameini.SaveIniFile( pergamefilepath );
 }
 
-void perGameSettings (std::string filename, const char* username) {
+void perGameSettings (std::string filename) {
 	int pressed = 0;
 
 	clearText();
@@ -119,7 +119,34 @@ void perGameSettings (std::string filename, const char* username) {
 
 	loadPerGameSettings(filename);
 
-	FILE *f_nds_file = fopen(filename.c_str(), "rb");
+	std::string filenameForInfo = filename;
+	if((filenameForInfo.substr(filenameForInfo.find_last_of(".") + 1) == "argv")
+	|| (filenameForInfo.substr(filenameForInfo.find_last_of(".") + 1) == "launcharg"))
+	{
+		std::vector<char*> argarray;
+
+		FILE *argfile = fopen(filenameForInfo.c_str(),"rb");
+			char str[PATH_MAX], *pstr;
+		const char seps[]= "\n\r\t ";
+
+		while( fgets(str, PATH_MAX, argfile) ) {
+			// Find comment and end string there
+			if( (pstr = strchr(str, '#')) )
+				*pstr= '\0';
+
+			// Tokenize arguments
+			pstr= strtok(str, seps);
+
+			while( pstr != NULL ) {
+				argarray.push_back(strdup(pstr));
+				pstr= strtok(NULL, seps);
+			}
+		}
+		fclose(argfile);
+		filenameForInfo = argarray.at(0);
+	}
+
+	FILE *f_nds_file = fopen(filenameForInfo.c_str(), "rb");
 
 	u32 SDKVersion = 0;
 	char game_TID[5];

romsel_dsimenutheme/arm9/source/perGameSettings.h

@@ -13,7 +13,7 @@ extern char fileCounter[8];
 
 void loadPerGameSettings(std::string filename);
 void savePerGameSettings(std::string filename);
-void perGameSettings(std::string filename, const char* username);
+void perGameSettings(std::string filename);
 
 
 

romsel_r4theme/arm9/source/fileBrowse.cpp

@@ -560,7 +560,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 		if ((pressed & KEY_SELECT) && (isDirectory == false) && (bnrRomType == 0) && (isHomebrew == false))
 		{
 			cursorPosition = fileOffset;
-			perGameSettings(dirContents.at(fileOffset).name, username);
+			perGameSettings(dirContents.at(fileOffset).name);
 		}
 
 	}

romsel_r4theme/arm9/source/perGameSettings.cpp

@@ -108,14 +108,41 @@ void savePerGameSettings (std::string filename) {
 	pergameini.SaveIniFile( pergamefilepath );
 }
 
-void perGameSettings (std::string filename, const char* username) {
+void perGameSettings (std::string filename) {
 	int pressed = 0;
 
 	clearText();
 
 	loadPerGameSettings(filename);
 
-	FILE *f_nds_file = fopen(filename.c_str(), "rb");
+	std::string filenameForInfo = filename;
+	if((filenameForInfo.substr(filenameForInfo.find_last_of(".") + 1) == "argv")
+	|| (filenameForInfo.substr(filenameForInfo.find_last_of(".") + 1) == "launcharg"))
+	{
+		std::vector<char*> argarray;
+
+		FILE *argfile = fopen(filenameForInfo.c_str(),"rb");
+			char str[PATH_MAX], *pstr;
+		const char seps[]= "\n\r\t ";
+
+		while( fgets(str, PATH_MAX, argfile) ) {
+			// Find comment and end string there
+			if( (pstr = strchr(str, '#')) )
+				*pstr= '\0';
+
+			// Tokenize arguments
+			pstr= strtok(str, seps);
+
+			while( pstr != NULL ) {
+				argarray.push_back(strdup(pstr));
+				pstr= strtok(NULL, seps);
+			}
+		}
+		fclose(argfile);
+		filenameForInfo = argarray.at(0);
+	}
+
+	FILE *f_nds_file = fopen(filenameForInfo.c_str(), "rb");
 
 	u32 SDKVersion = 0;
 	char game_TID[5];

romsel_r4theme/arm9/source/perGameSettings.h

@@ -11,7 +11,7 @@ extern int perGameSettings_asyncPrefetch;
 
 void loadPerGameSettings(std::string filename);
 void savePerGameSettings(std::string filename);
-void perGameSettings(std::string filename, const char* username);
+void perGameSettings(std::string filename);