GameMode Multiplayer Compatibility Enforcement bugfix

Author: wkdgmr

Source/diablo.cpp

@@ -147,6 +147,19 @@ extern void plrctrls_after_check_curs_move();
 extern void plrctrls_every_frame();
 extern void plrctrls_after_game_logic();
 
+uint32_t GetGameId()
+{
+	const auto &options = GetOptions();
+	if (gbIsHellfire) {
+		if (*options.Gameplay.disableSearch || *options.Gameplay.removeCripplingEffects || *options.Gameplay.sharedXP)
+			return GameIdHellfireEnhanced;
+		return gbIsSpawn ? GameIdHellfireSpawn : GameIdHellfireFull;
+	}
+	if (*options.Gameplay.disableSearch || *options.Gameplay.removeCripplingEffects || *options.Gameplay.sharedXP)
+		return GameIdDiabloEnhanced;
+	return gbIsSpawn ? GameIdDiabloSpawn : GameIdDiabloFull;
+}
+
 namespace {
 
 char gszVersionNumber[64] = "internal version unknown";
@@ -2123,31 +2136,31 @@ void InitPadmapActions()
 	    N_("Move up"),
 	    N_("Moves the player character up."),
 	    ControllerButton_BUTTON_DPAD_UP,
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "MoveDown",
 	    N_("Move down"),
 	    N_("Moves the player character down."),
 	    ControllerButton_BUTTON_DPAD_DOWN,
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "MoveLeft",
 	    N_("Move left"),
 	    N_("Moves the player character left."),
 	    ControllerButton_BUTTON_DPAD_LEFT,
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "MoveRight",
 	    N_("Move right"),
 	    N_("Moves the player character right."),
 	    ControllerButton_BUTTON_DPAD_RIGHT,
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "StandGround",
 	    N_("Stand ground"),
 	    N_("Hold to prevent the player from moving."),
 	    ControllerButton_NONE,
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "ToggleStandGround",
 	    N_("Toggle stand ground"),
@@ -2233,25 +2246,25 @@ void InitPadmapActions()
 	    N_("Move mouse up"),
 	    N_("Simulates upward mouse movement."),
 	    { ControllerButton_BUTTON_BACK, ControllerButton_BUTTON_DPAD_UP },
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "MouseDown",
 	    N_("Move mouse down"),
 	    N_("Simulates downward mouse movement."),
 	    { ControllerButton_BUTTON_BACK, ControllerButton_BUTTON_DPAD_DOWN },
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "MouseLeft",
 	    N_("Move mouse left"),
 	    N_("Simulates leftward mouse movement."),
 	    { ControllerButton_BUTTON_BACK, ControllerButton_BUTTON_DPAD_LEFT },
-	    [] {});
+	    [] { });
 	options.Padmapper.AddAction(
 	    "MouseRight",
 	    N_("Move mouse right"),
 	    N_("Simulates rightward mouse movement."),
 	    { ControllerButton_BUTTON_BACK, ControllerButton_BUTTON_DPAD_RIGHT },
-	    [] {});
+	    [] { });
 	auto leftMouseDown = [] {
 		ControllerButtonCombo standGroundCombo = GetOptions().Padmapper.ButtonComboForAction("StandGround");
 		bool standGround = StandToggle || IsControllerButtonComboPressed(standGroundCombo);

Source/diablo.h

@@ -29,18 +29,7 @@ constexpr uint32_t GameIdHellfireSpawn = LoadBE32("HSHR");
 constexpr uint32_t GameIdDiabloEnhanced = LoadBE32("D1EN");
 constexpr uint32_t GameIdHellfireEnhanced = LoadBE32("HFEN");
 
-inline uint32_t GetGameId()
-{
-	const auto &options = GetOptions();
-	if (gbIsHellfire) {
-		if (*options.Gameplay.disableSearch || *options.Gameplay.removeCripplingEffects || *options.Gameplay.sharedXP)
-			return GameIdHellfireEnhanced;
-		return gbIsSpawn ? GameIdHellfireSpawn : GameIdHellfireFull;
-	}
-	if (*options.Gameplay.disableSearch || *options.Gameplay.removeCripplingEffects || *options.Gameplay.sharedXP)
-		return GameIdDiabloEnhanced;
-	return gbIsSpawn ? GameIdDiabloSpawn : GameIdDiabloFull;
-}
+uint32_t GetGameId();
 
 #define NUMLEVELS 25