Merge remote-tracking branches 'Nova-px/bump-pilot-date' and 'LWSS/pu…

…remodehardcoded'
citizenfx · Sep 25, 2023 · 47adce0 · 47adce0
3 parents bbd84b1 + c1ae088 + 4699c87
commit 47adce0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/code/client/shared/PureModeState.h b/code/client/shared/PureModeState.h
@@ -20,13 +20,10 @@ inline int GetPureLevel()
 	std::wstring_view cli = (sharedData->initCommandLine[0]) ? sharedData->initCommandLine : GetCommandLineW();
 	pureLevel = 0;
 
-	if (cli.find(L"pure_1") != std::string_view::npos)
+	size_t found = cli.find(L"-pure_");
+	if (found != std::wstring_view::npos)
 	{
-		pureLevel = 1;
-	}
-	else if (cli.find(L"pure_2") != std::string_view::npos)
-	{
-		pureLevel = 2;
+		pureLevel = _wtoi(&cli[found + 6]);
 	}
 
 	return pureLevel;

diff --git a/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp b/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp
@@ -263,11 +263,12 @@ int MonoScriptRuntime::HandlesFile(char* filename, IScriptHostWithResourceData*
 	}
 
 	// last supported date for this pilot of mono_rt2, in UTC
-	constexpr int maxYear = 2023, maxMonth = 8, maxDay = 31;
+	constexpr int maxYear = 2023, maxMonth = 12, maxDay = 31;
 
 	// Allowed values for mono_rt2
 	constexpr std::string_view allowedValues[] = {
 		// put latest on top, right here ↓
+		"Prerelease expiring 2023-12-31. See https://aka.cfx.re/mono-rt2-preview for info."sv,
 		"Prerelease expiring 2023-08-31. See https://aka.cfx.re/mono-rt2-preview for info."sv,
 		"Prerelease expiring 2023-06-30. See https://aka.cfx.re/mono-rt2-preview for info."sv,
 	};