Fix for chainsaw clipping in Angela's room (#1179)

Author: mercury501

Patches/InputTweaks.cpp

@@ -377,6 +377,12 @@ void InputTweaks::TweakGetDeviceState(LPDIRECTINPUTDEVICE8A ProxyInterface, DWOR
 			return;
 		}
 
+		// Clear the Ready Weapon button in the mirror room to avoid clipping issues
+		if (GetRoomID() == R_APT_W_RM_109_2)
+		{
+			ControllerData->rgbButtons[KeyBinds.GetReadyWeaponButtonBind()] = KEY_CLEAR;
+		}
+
 		// Clear the the pause button if a quicksave is in progress
 		if (GameLoadFix && (GetIsWritingQuicksave() == 1 || GetTextAddr() == 1))
 			ControllerData->rgbButtons[KeyBinds.GetPauseButtonBind()] = KEY_CLEAR;
@@ -446,6 +452,12 @@ void InputTweaks::TweakGetDeviceState(LPDIRECTINPUTDEVICE8A ProxyInterface, DWOR
 			InfoCombo.State = false;
 		}
 
+		// Clear the Ready Weapon keybind in the mirror room to avoid clipping issues
+		if (GetRoomID() == R_APT_W_RM_109_2)
+		{
+			ClearKey(KeyBinds.GetKeyBind(KEY_READY_WEAPON));
+		}
+
 		// Update Esc/Cancel input states
 		EscInput.State = IsKeyPressed(KeyBinds.GetKeyBind(KEY_SKIP));
 		EscInput.UpdateHolding();
@@ -851,6 +863,12 @@ void InputTweaks::ReadMouseButtons()
 
 	SetLMButton = (MouseState.rgbButtons[0] == KEY_SET);
 	RMB.State = (MouseState.rgbButtons[1] == KEY_SET);
+	
+	// Update right mouse button state, avoiding setting RMB for angela's mirror room
+	if (GetRoomID() == R_APT_W_RM_109_2)
+	{
+		RMB.State = false;
+	}
 }
 
 float InputTweaks::GetMouseAnalogX()
@@ -1086,6 +1104,11 @@ BYTE KeyBindsHandler::GetPauseButtonBind()
 	return *(GetKeyBindsPointer() + 0xF0);
 }
 
+BYTE KeyBindsHandler::GetReadyWeaponButtonBind()
+{
+	return *(GetKeyBindsPointer() + 0x128);
+}
+
 int CountCollectedMemos()
 {
 	auto* psVar2 = GetMemoCountIndexPointer();

Patches/InputTweaks.h

@@ -200,6 +200,7 @@ class KeyBindsHandler
 public:
 	BYTE GetKeyBind(int KeyIndex);
 	BYTE GetPauseButtonBind();
+	BYTE GetReadyWeaponButtonBind();
 };
 
 // Hitboxes for pause and memo menu

Resources/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 2244 
+#define BUILD_NUMBER 2245