From 7cbf36bf17df70d325d03e4cd40859ac31b4c2e2 Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Wed, 8 May 2013 09:45:07 +0000
Subject: Refactored window clicking code to use different click actions

First part of solving FS #371; should fix #370.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1459 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/Protocol/Protocol125.cpp | 42 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'source/Protocol/Protocol125.cpp')

diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 4be4cb033..17def7c8a 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -1381,7 +1381,47 @@ int cProtocol125::ParseWindowClick(void)
 	{
 		return res;
 	}
-	m_Client->HandleWindowClick(WindowID, SlotNum, IsRightClick, IsShiftPressed, HeldItem);
+	
+	// Convert IsShiftPressed, IsRightClick, SlotNum and HeldItem into eClickAction used in the newer protocols:
+	eClickAction Action;
+	if (IsRightClick)
+	{
+		if (IsShiftPressed)
+		{
+			Action = caShiftRightClick;
+		}
+		else
+		{
+			if (SlotNum == -999)
+			{
+				Action = (HeldItem.IsEmpty()) ? caRightClickOutsideHoldNothing : caRightClickOutside;
+			}
+			else
+			{
+				Action = caRightClick;
+			}
+		}
+	}
+	else
+	{
+		// IsLeftClick
+		if (IsShiftPressed)
+		{
+			Action = caShiftLeftClick;
+		}
+		else
+		{
+			if (SlotNum == -999)
+			{
+				Action = (HeldItem.IsEmpty()) ? caLeftClickOutsideHoldNothing : caRightClickOutside;
+			}
+			else
+			{
+				Action = caLeftClick;
+			}
+		}
+	}
+	m_Client->HandleWindowClick(WindowID, SlotNum, Action, HeldItem);
 	return PARSE_OK;
 }
 
-- 
cgit v1.2.3