From 304c0ef5ec49972d6fab6904e80b8e371f365b7f Mon Sep 17 00:00:00 2001
From: Cyan <cyan06@users.noreply.github.com>
Date: Tue, 30 Apr 2013 17:40:17 +0000
Subject: [PATCH] * Added QuadForce 2.0 version detection

---
 HBC/META.XML                     |  4 ++--
 source/prompts/PromptWindows.cpp |  5 +++--
 source/system/IosLoader.cpp      | 12 ++++++++++--
 source/system/IosLoader.h        |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 7e2167d9..16dce4f1 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>3.0 r1213</version>
-		<release_date>20130413145406</release_date>
+		<version>3.0 r1214</version>
+		<release_date>20130430170233</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index d2b07708..cca5c8e1 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -48,7 +48,7 @@ static const char * DMLVersions[] =
 	"",			// Original MIOS
 	"r51-",		// old DML r51-
 	"r52",		// old DML r52
-	"",			// QuadForce 01
+	"v0.1",		// QuadForce v0.1
 	"v1.2",		// DML 1.2
 	"v1.4",		// DML 1.4
 	"v1.4b",	// DML 1.4b
@@ -75,6 +75,7 @@ static const char * DMLVersions[] =
 	"v2.8",		// DM 2.8
 	"v2.9+",	// DML 2.9
 	"v2.9+",	// DM 2.9
+	"v2.0",		// QuadForce v2.0
 };
 
 
@@ -299,7 +300,7 @@ void WindowCredits()
 	else if (currentMIOS == DIOS_MIOS_LITE)
 		snprintf(GCInfo, sizeof(GCInfo), "DIOS-MIOS Lite %s", DMLVersions[IosLoader::GetDMLVersion()]);
 	else if (currentMIOS == QUADFORCE)
-		snprintf(GCInfo, sizeof(GCInfo), "QuadForce");
+		snprintf(GCInfo, sizeof(GCInfo), "QuadForce %s", DMLVersions[IosLoader::GetDMLVersion()]);
 		
 	// Check if Devolution is available
 	char DEVO_loader_path[100];
diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp
index 2232ecba..8a3c4eed 100644
--- a/source/system/IosLoader.cpp
+++ b/source/system/IosLoader.cpp
@@ -245,8 +245,16 @@ u8 IosLoader::GetMIOSInfo(bool checkedOnBoot)
 			else if((*(u32*)(appfile+i)) == 'Quad' && (*(u32*)(appfile+i+4)) == 'Forc')
 			{
 				currentMIOS = QUADFORCE;
-				gprintf("QuadForce v0.1");
-				currentDMLVersion = DML_VERSION_QUAD_0_1;
+				if((*(u32*)(appfile+i+8)) == 'e 2.') // QuadForce 2.0
+				{
+					gprintf("QuadForce v2.0 \n");
+					currentDMLVersion = DML_VERSION_QUAD_2_0;
+				}
+				else // QuadForce 0.1
+				{
+					gprintf("QuadForce v0.1 \n");
+					currentDMLVersion = DML_VERSION_QUAD_0_1;
+				}
 				break;
 			}
 		}
diff --git a/source/system/IosLoader.h b/source/system/IosLoader.h
index d3d7fd04..2551f026 100644
--- a/source/system/IosLoader.h
+++ b/source/system/IosLoader.h
@@ -59,6 +59,7 @@ enum DMLVersions
 	DML_VERSION_DM_2_8,		// Feb 24 2013 14:17:03
 	DML_VERSION_DML_2_9,	// Apr  5 2013 18:20:33
 	DML_VERSION_DM_2_9,		// Apr  5 2013 18:29:35
+	DML_VERSION_QUAD_2_0,	// Apr 30 2013 17:31:32
 	DML_VERSION_MAX_VERSION,
 };