build

NoMercy-ac · May 28, 2024 · b04d3df · b04d3df
1 parent bda7854
commit b04d3df
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/module/include/NoMercyGameModule.h b/module/include/NoMercyGameModule.h
@@ -37,6 +37,7 @@ enum NM_ERRORTYPES
 	RESPONSE_IS_NULL = 4,
 	RESPONSE_IS_NOT_VALID = 5,
 	REQUIRE_RESTART = 6,
+	UNALLOWED_LICENSE_TYPE = 7,
 };
 
 enum NM_USERSTATUS
@@ -59,6 +60,7 @@ enum NM_MESSAGE_IDS
 {
 	NM_MSG_NONE,
 	NM_MSG_REQUIRE_RESTART,
+	NM_MSG_UNALLOWED_LICENSE_TYPE
 };
 
 struct NM_ErrorData

diff --git a/module/src/game_module_impl.cpp b/module/src/game_module_impl.cpp
@@ -362,6 +362,20 @@ bool CNoMercyGameModule::__GetRequest(const std::string& body, std::string& resp
 		m_pkLastError->error_code = 0;
 		return true;
 	}
+	else if (res->body == "UNALLOWED_LICENSE_TYPE")
+	{
+		if (m_pMessageCallback)
+		{
+			m_pMessageCallback(NM_MESSAGE_IDS::NM_MSG_UNALLOWED_LICENSE_TYPE, nullptr);
+			return true;
+		}
+
+		this->__Log(NM_VERBOSETYPES::NM_VERBOSE_ERROR, "GET request to %s failed with special response: %s", c_stTarget.c_str(), res->body.c_str());
+
+		m_pkLastError->error_type = UNALLOWED_LICENSE_TYPE;
+		m_pkLastError->error_code = 0;
+		return false;
+	}
 
 	if (!bSkipResponseCheck && !this->__StringIsNumber(res->body)) // Response format
 	{
@@ -431,6 +445,20 @@ bool CNoMercyGameModule::__GetRequest(const std::string& body, std::string& resp
 		m_pkLastError->error_code = 0;
 		return true;
 	}
+	else if (res.text == "UNALLOWED_LICENSE_TYPE")
+	{
+		if (m_pMessageCallback)
+		{
+			m_pMessageCallback(NM_MESSAGE_IDS::NM_MSG_UNALLOWED_LICENSE_TYPE, nullptr);
+			return true;
+		}
+
+		this->__Log(NM_VERBOSETYPES::NM_VERBOSE_ERROR, "GET request to %s failed with special response: %s", c_stTarget.c_str(), res.text.c_str());
+
+		m_pkLastError->error_type = UNALLOWED_LICENSE_TYPE;
+		m_pkLastError->error_code = 0;
+		return false;
+	}
 
 	if (!bSkipResponseCheck && !this->__StringIsNumber(res.text)) // Response format
 	{

diff --git a/test/src/NoMercyServer.cpp b/test/src/NoMercyServer.cpp
@@ -194,6 +194,10 @@ void OnNomercyMessage(const uint8_t message, void* data)
 		sys_log(0, "NMMessageCallback> Require restart message received!");
 		CNoMercyServer::Instance().ReconnectToNoMercyServer();
 		break;
+	case NM_MSG_UNALLOWED_LICENSE_TYPE:
+		sys_err("NMMessageCallback> Unallowed license type message received!");
+		std::exit(1);
+		break;
 	default:
 		sys_err("NMMessageCallback> Unknown message received: %d", message);
 		break;