Add GVGNP adhoc compat hack(without breaking other games)

LunaMoo · Nov 2, 2018 · ab2de48 · ab2de48
1 parent 466461b
commit ab2de48
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp
@@ -68,6 +68,7 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
 	CheckSetting(iniFile, gameID, "DisableAccurateDepth", &flags_.DisableAccurateDepth);
 	CheckSetting(iniFile, gameID, "MGS2AcidHack", &flags_.MGS2AcidHack);
 	CheckSetting(iniFile, gameID, "SonicRivalsHack", &flags_.SonicRivalsHack);
+	CheckSetting(iniFile, gameID, "AdhocHack", &flags_.AdhocHackDisableNBSwitch);
 }
 
 void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, bool *flag) {

diff --git a/Core/Compatibility.h b/Core/Compatibility.h
@@ -68,6 +68,7 @@ struct CompatFlags {
 	bool DisableAccurateDepth;
 	bool MGS2AcidHack;
 	bool SonicRivalsHack;
+	bool AdhocHackDisableNBSwitch;
 };
 
 class IniFile;

diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
@@ -1956,7 +1956,7 @@ static int sceNetAdhocPtpConnect(int id, int timeout, int flag) {
 					// Grab Nonblocking Flag
 					uint32_t nbio = getBlockingFlag(socket->id);
 					// Switch to Nonblocking Behaviour
-					if (nbio == 0) {
+					if (nbio == 0 && !PSP_CoreParameter().compat.flags().AdhocHackDisableNBSwitch) {
 						// Overwrite Socket Option
 						changeBlockingMode(socket->id, 1);
 					}

diff --git a/assets/compat.ini b/assets/compat.ini
@@ -432,3 +432,8 @@ ULES00622 = true  # SR1
 ULUS10195 = true  # SR1
 ULUS10323 = true  # SR2
 ULES00940 = true  # SR2
+
+[AdhocHackDisableNBSwitch]
+ULJS00250 = true
+ULJS19048 = true
+NPJH50107 = true