From abd8b12e2d0df45afd368e4791f16401fe718124 Mon Sep 17 00:00:00 2001 From: disinvite Date: Wed, 4 Dec 2024 17:42:52 -0500 Subject: [PATCH] Rename drag notifications --- .../lego/legoomni/src/entity/legocameracontroller.cpp | 6 +++--- LEGO1/lego/legoomni/src/input/legoinputmanager.cpp | 10 +++++----- LEGO1/omni/include/mxnotificationparam.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp index 151e92e0..71c4114b 100644 --- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp @@ -42,7 +42,7 @@ MxResult LegoCameraController::Create() MxLong LegoCameraController::Notify(MxParam& p_param) { switch (((MxNotificationParam&) p_param).GetNotification()) { - case c_notificationDrag: { + case c_notificationDragEnd: { if (((((LegoEventNotificationParam&) p_param).GetModifier()) & LegoEventNotificationParam::c_lButtonState) == 0) { OnLButtonUp(MxPoint32( @@ -57,7 +57,7 @@ MxLong LegoCameraController::Notify(MxParam& p_param) )); } } break; - case c_notificationDragEnd: { + case c_notificationDragStart: { if ((((LegoEventNotificationParam&) p_param).GetModifier()) & LegoEventNotificationParam::c_lButtonState) { OnLButtonDown(MxPoint32( ((LegoEventNotificationParam&) p_param).GetX(), @@ -71,7 +71,7 @@ MxLong LegoCameraController::Notify(MxParam& p_param) )); } } break; - case c_notificationDragStart: { + case c_notificationDrag: { OnMouseMove( ((LegoEventNotificationParam&) p_param).GetModifier(), MxPoint32(((LegoEventNotificationParam&) p_param).GetX(), ((LegoEventNotificationParam&) p_param).GetY()) diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp index b099454a..31c4eabd 100644 --- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp +++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp @@ -379,7 +379,7 @@ MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param) if (p_param.GetKey() == VK_SHIFT) { if (m_unk0x195) { m_unk0x80 = FALSE; - p_param.SetNotification(c_notificationDrag); + p_param.SetNotification(c_notificationDragEnd); if (m_camera) { m_camera->Notify(p_param); @@ -506,7 +506,7 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param) StopAutoDragTimer(); if (m_unk0x80) { - p_param.SetNotification(c_notificationDrag); + p_param.SetNotification(c_notificationDragEnd); result = TRUE; } else if (m_unk0x81) { @@ -538,14 +538,14 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param) if (m_unk0x195 || t > m_unk0x74) { StopAutoDragTimer(); m_unk0x80 = TRUE; - p_param.SetNotification(c_notificationDragEnd); + p_param.SetNotification(c_notificationDragStart); result = TRUE; p_param.SetX(m_x); p_param.SetY(m_y); } } else { - p_param.SetNotification(c_notificationDragStart); + p_param.SetNotification(c_notificationDrag); result = TRUE; } } @@ -559,7 +559,7 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param) p_param.SetX(m_x); p_param.SetY(m_y); p_param.SetModifier(LegoEventNotificationParam::c_lButtonState); - p_param.SetNotification(c_notificationDragEnd); + p_param.SetNotification(c_notificationDragStart); result = TRUE; } else { diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h index 66104b91..68c4833b 100644 --- a/LEGO1/omni/include/mxnotificationparam.h +++ b/LEGO1/omni/include/mxnotificationparam.h @@ -20,9 +20,9 @@ enum NotificationId { c_notificationButtonDown = 9, // 100d6aa0 c_notificationMouseMove = 10, // 100d6aa0 c_notificationClick = 11, // 100d6aa0 - c_notificationDragEnd = 12, - c_notificationDragStart = 13, - c_notificationDrag = 14, + c_notificationDragStart = 12, + c_notificationDrag = 13, + c_notificationDragEnd = 14, c_notificationTimer = 15, // 100d6aa0 c_notificationControl = 17, c_notificationEndAnim = 18, // 100d7e80