merge cafeberry/main (keep ported KBM input)

4J_Profile/Windows64/4J_Profile.cpp

@@ -90,3 +90,13 @@ void C_4JProfile::SetDebugFullOverride(bool bVal)
 {
 	InternalProfileManager.m_Sys.SetDebugFullOverride(bVal);
 }
+
+bool C_4JProfile::LocaleIsUSorCanada()
+{
+	return InternalProfileManager.m_Sys.LocaleIsUSorCanada();
+}
+
+bool C_4JProfile::LocaleIsChina()
+{
+	return InternalProfileManager.m_Sys.LocaleIsChina();
+}

4J_Profile/Windows64/PRO_Main.cpp

@@ -2,12 +2,20 @@
 
 CProfile InternalProfileManager;
 
+CProfile::CProfile()
+{
+	m_LockedProfile = 0;
+}
+
 int CProfile::GetLockedProfile()
 {
-	return 0;
+	return m_LockedProfile;
 }
 
 void CProfile::SetLockedProfile(int iProf)
 {
-	;
+	if(m_LockedProfile != iProf)
+	{
+		m_LockedProfile = iProf;
+	}
 }

4J_Profile/Windows64/PRO_Main.h

@@ -6,11 +6,16 @@
 class CProfile
 {
 public:
+	CProfile();
+
 	int GetLockedProfile();
 	void SetLockedProfile(int iProf);
 
 	CSys m_Sys;
 	CProfileData m_ProfileData;
+
+private:
+	int m_LockedProfile;
 };
 
 // Singleton

4J_Profile/Windows64/PRO_Sys.cpp

@@ -2,8 +2,13 @@
 #include "4J_Input.h"
 
 bool s_bProfileIsFullVersion = true;
-char fakeGamerTag[16] = "PlayerName";
-wchar_t fakeGamerTagW[16] = L"PlayerName";
+char fakeGamerTag[XUSER_NAME_SIZE] = "PlayerName";
+wchar_t fakeGamerTagW[XUSER_NAME_SIZE] = L"PlayerName";
+
+CSys::CSys()
+{
+	m_iPrimaryPad = 0;
+}
 
 bool CSys::IsSignedIn(int iQuadrant)
 {
@@ -69,7 +74,7 @@ void CSys::SetFakeGamertag(char *name)
 	size_t chars = 0;
 
 	strcpy_s(fakeGamerTag, name);
-	mbstowcs_s(&chars, fakeGamerTagW, 16, name, _TRUNCATE);
+	mbstowcs_s(&chars, fakeGamerTagW, XUSER_NAME_SIZE, name, _TRUNCATE);
 }
 
 char* CSys::GetGamertag(int iPad)
@@ -79,7 +84,7 @@ char* CSys::GetGamertag(int iPad)
 		return fakeGamerTag;
 	}
 	
-	static char iPadGamertag[32];
+	char iPadGamertag[XUSER_NAME_SIZE];
 
 	_snprintf_s(iPadGamertag, sizeof(iPadGamertag), "%s (%d)", fakeGamerTag, iPad);
 
@@ -93,7 +98,7 @@ wstring CSys::GetDisplayName(int iPad)
 		return fakeGamerTagW;
 	}
 
-	wchar_t iPadGamertagW[16];
+	wchar_t iPadGamertagW[XUSER_NAME_SIZE];
 
 	_snwprintf_s(iPadGamertagW, _countof(iPadGamertagW), L"%s (%d)", fakeGamerTagW, iPad);
 
@@ -107,12 +112,17 @@ bool CSys::AllowedToPlayMultiplayer(int iProf)
 
 int CSys::GetPrimaryPad()
 {
-	return 0;
+	return m_iPrimaryPad;
 }
 
 void CSys::SetPrimaryPad(int iPad) 
 {
-	; //str1k3r - stubbed out
+	m_iPrimaryPad = iPad;
+}
+
+void CSys::SetDebugFullOverride(bool bVal)
+{
+	s_bProfileIsFullVersion = bVal;
 }
 
 bool CSys::IsFullVersion()
@@ -120,7 +130,19 @@ bool CSys::IsFullVersion()
 	return s_bProfileIsFullVersion;
 }
 
-void CSys::SetDebugFullOverride(bool bVal)
+//str1k3r - fun fact this is 1:1 to the Durango lib
+bool CSys::LocaleIsUSorCanada()
 {
-	s_bProfileIsFullVersion = bVal;
+	GEOID UserGeoID;
+
+	UserGeoID = GetUserGeoID(GEOCLASS_NATION);
+	return UserGeoID == 39 || UserGeoID == 244;
+}
+
+bool CSys::LocaleIsChina()
+{
+	GEOID UserGeoID;
+
+	UserGeoID = GetUserGeoID(GEOCLASS_NATION);
+	return UserGeoID == 45;
 }

4J_Profile/Windows64/PRO_Sys.h

@@ -5,6 +5,8 @@
 class CSys
 {
 public:
+	CSys();
+
 	// SIGNED IN
 	bool IsSignedIn(int iQuadrant);
 	bool IsSignedInLive(int iProf);
@@ -27,4 +29,10 @@ public:
 	bool IsFullVersion();
 
 	void SetDebugFullOverride(bool bVal);
+
+	// LOCALE
+	bool LocaleIsUSorCanada();
+	bool LocaleIsChina();
+
+	int m_iPrimaryPad;
 };