Mission skip improvements (#9)

* Fix mission skip bug when selecting tutorial
* Various minor improvements in MissionSkipPatch

Author: UnknownException

subtitans/missionskippatch.cpp

@@ -29,11 +29,23 @@ namespace MissionSkip {
 		if (_strupr_s(cheatActivatedMapName, sizeof(cheatActivatedMapName)) != 0)
 		{
 			GetLogger()->Error("Failed to convert map name to uppercase\n");
+			GetLogger()->Informational("Orbiton has been disabled\n");
 			return;
 		}
 
+		constexpr int missionValidationStringLength = sizeof(MissionValidationString) - 1;
+		constexpr int missionNumberStringLength = 3;
+		
+		// Validate if the string has the expected length
+		if(strlen(cheatActivatedMapName) < missionValidationStringLength + missionNumberStringLength)
+		{
+			GetLogger()->Warning("Current map has an unexpected length, are you sure this is a mission?\n");
+			GetLogger()->Informational("Orbiton has been disabled\n");
+			return;
+		}
+		
 		// Check if the current map is a mission
-		for (unsigned int i = 0; i < sizeof(MissionValidationString) - 1; ++i)
+		for (unsigned int i = 0; i < missionValidationStringLength; ++i)
 		{	
 			if (MissionValidationString[i] != cheatActivatedMapName[i])
 			{
@@ -42,17 +54,17 @@ namespace MissionSkip {
 				return;
 			}
 		}
-
-		char missionNumberAsString[4] = { 0x00, };
-		memcpy_s(missionNumberAsString, sizeof(missionNumberAsString), cheatActivatedMapName + strlen(MissionValidationString), 3);
+		
+		char missionNumberAsString[missionNumberStringLength + 1] = { 0x00, };
+		memcpy_s(missionNumberAsString, sizeof(missionNumberAsString), cheatActivatedMapName + missionValidationStringLength, missionNumberStringLength);
 		int missionNumber = atoi(missionNumberAsString + 1); // Skip team
 		if (missionNumber < 10)
 			missionNumber++;
 
-		sprintf_s(missionNumberAsString + 1, sizeof(missionNumberAsString), "%02d", missionNumber);
-		memcpy_s(cheatActivatedMapName + strlen(MissionValidationString), 3, missionNumberAsString, 3);
+		sprintf_s(missionNumberAsString + 1, sizeof(missionNumberAsString) - 1, "%02d", missionNumber);
+		memcpy_s(cheatActivatedMapName + missionValidationStringLength, missionNumberStringLength, missionNumberAsString, missionNumberStringLength);
 
-		memcpy_s(OrbitonMissionPathPattern + sizeof(OrbitonMissionPathPattern) - 4, 3, missionNumberAsString, 3);
+		memcpy_s(OrbitonMissionPathPattern + (sizeof(OrbitonMissionPathPattern) - 1) - missionNumberStringLength, missionNumberStringLength, missionNumberAsString, missionNumberStringLength);
 
 		GetLogger()->Informational("Next mission will be forced to: %s\nExit to main menu and start a new campaign.\n", cheatActivatedMapName);
 
@@ -106,12 +118,18 @@ namespace MissionSkip {
 
 		__declspec(naked) void Implementation()
 		{
-			__asm cmp [OrbitonActivated], 0;
+			__asm cmp [OrbitonActivated], 0x00;
 			__asm je fullPathOrbitonDeactivated;
 
+			__asm cmp ecx, 0x01;
+			__asm je disableOrbitonForTutorial;
+
 			__asm push offset [OrbitonMissionPathPattern];
 			__asm jmp [JmpBackAddress];
 
+		disableOrbitonForTutorial:
+			__asm mov [OrbitonActivated], 0x00;
+		
 		fullPathOrbitonDeactivated:
 			__asm push offset [DefaultMissionPathPattern];
 			__asm jmp [JmpBackAddress];
@@ -127,11 +145,11 @@ namespace MissionSkip {
 
 		__declspec(naked) void Implementation()
 		{
-			__asm cmp [OrbitonActivated], 0;
+			__asm cmp [OrbitonActivated], 0x00;
 			__asm je fullPathOrbitonDeactivated;
 
 			__asm push offset [OrbitonMissionPathPattern + 0x02];
-			__asm mov [OrbitonActivated], 0;
+			__asm mov [OrbitonActivated], 0x00;
 			__asm jmp [JmpBackAddress];
 
 		fullPathOrbitonDeactivated:

subtitans/nativeresolutionpatch.cpp

@@ -24,9 +24,9 @@ namespace NativeResolution{
 			__asm mov edx, dword ptr ds:[esi + 0x8C];
 			__asm cmp edx, 0xF0; // Only do this for 1280x1024 resolution modification
 			__asm jne ASM_NR_RBM_NOTNATIVERES;
-			__asm cmp ecx, 1 // Check if last (0x0B: Left TV panel) <-- Don't add default value if match
-			__asm jne ASM_NR_RBM_DONTOVERRIDEDEFAULT
-			__asm mov edx, 0x00
+			__asm cmp ecx, 0x01; // Check if last (0x0B: Left TV panel) <-- Don't add default value if match
+			__asm jne ASM_NR_RBM_DONTOVERRIDEDEFAULT;
+			__asm mov edx, 0x00;
 
 		ASM_NR_RBM_DONTOVERRIDEDEFAULT:
 			__asm add edx, [ControlPanelMarginLeft]; // Widescreen reposition value
@@ -36,7 +36,7 @@ namespace NativeResolution{
 			__asm mov ebx, dword ptr ds:[eax];
 			__asm add ebx, edx;
 			__asm mov dword ptr ds:[eax], ebx;
-			__asm add eax, 4;
+			__asm add eax, 0x04;
 			__asm dec ecx;
 			__asm jnz ASM_NR_RBM_LOOP;
 
@@ -298,7 +298,7 @@ namespace NativeResolution{
 		__declspec(naked) void Implementation()
 		{
 			__asm sub ecx, [ControlPanelMarginLeft];
-			__asm mov dword ptr ds:[esi + 0x10c], ecx;
+			__asm mov dword ptr ds:[esi + 0x10C], ecx;
 			__asm jmp [JmpBackAddress];
 		}
 	}