isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-22 15:51:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename drag notifications

Browse Source
This commit is contained in:
disinvite 2024-12-04 17:42:52 -05:00
parent 587782450d
commit abd8b12e2d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
View File

@ -42,7 +42,7 @@ MxResult LegoCameraController::Create()
MxLong LegoCameraController::Notify(MxParam& p_param) MxLong LegoCameraController::Notify(MxParam& p_param)
{ {
switch (((MxNotificationParam&) p_param).GetNotification()) { switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationDrag: { case c_notificationDragEnd: {
if (((((LegoEventNotificationParam&) p_param).GetModifier()) & LegoEventNotificationParam::c_lButtonState) == if (((((LegoEventNotificationParam&) p_param).GetModifier()) & LegoEventNotificationParam::c_lButtonState) ==
0) { 0) {
OnLButtonUp(MxPoint32( OnLButtonUp(MxPoint32(
@ -57,7 +57,7 @@ MxLong LegoCameraController::Notify(MxParam& p_param)
)); ));
} }
} break; } break;
case c_notificationDragEnd: { case c_notificationDragStart: {
if ((((LegoEventNotificationParam&) p_param).GetModifier()) & LegoEventNotificationParam::c_lButtonState) { if ((((LegoEventNotificationParam&) p_param).GetModifier()) & LegoEventNotificationParam::c_lButtonState) {
OnLButtonDown(MxPoint32( OnLButtonDown(MxPoint32(
((LegoEventNotificationParam&) p_param).GetX(), ((LegoEventNotificationParam&) p_param).GetX(),
@ -71,7 +71,7 @@ MxLong LegoCameraController::Notify(MxParam& p_param)
)); ));
} }
} break; } break;
case c_notificationDragStart: { case c_notificationDrag: {
OnMouseMove( OnMouseMove(
((LegoEventNotificationParam&) p_param).GetModifier(), ((LegoEventNotificationParam&) p_param).GetModifier(),
MxPoint32(((LegoEventNotificationParam&) p_param).GetX(), ((LegoEventNotificationParam&) p_param).GetY()) MxPoint32(((LegoEventNotificationParam&) p_param).GetX(), ((LegoEventNotificationParam&) p_param).GetY())

10
LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
View File

@ -379,7 +379,7 @@ MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param)
if (p_param.GetKey() == VK_SHIFT) { if (p_param.GetKey() == VK_SHIFT) {
if (m_unk0x195) { if (m_unk0x195) {
m_unk0x80 = FALSE; m_unk0x80 = FALSE;
p_param.SetNotification(c_notificationDrag); p_param.SetNotification(c_notificationDragEnd);
if (m_camera) { if (m_camera) {
m_camera->Notify(p_param); m_camera->Notify(p_param);
@ -506,7 +506,7 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param)
StopAutoDragTimer(); StopAutoDragTimer();
if (m_unk0x80) { if (m_unk0x80) {
p_param.SetNotification(c_notificationDrag); p_param.SetNotification(c_notificationDragEnd);
result = TRUE; result = TRUE;
} }
else if (m_unk0x81) { else if (m_unk0x81) {
@ -538,14 +538,14 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param)
if (m_unk0x195 || t > m_unk0x74) { if (m_unk0x195 || t > m_unk0x74) {
StopAutoDragTimer(); StopAutoDragTimer();
m_unk0x80 = TRUE; m_unk0x80 = TRUE;
p_param.SetNotification(c_notificationDragEnd); p_param.SetNotification(c_notificationDragStart);
result = TRUE; result = TRUE;
p_param.SetX(m_x); p_param.SetX(m_x);
p_param.SetY(m_y); p_param.SetY(m_y);
} }
} }
else { else {
p_param.SetNotification(c_notificationDragStart); p_param.SetNotification(c_notificationDrag);
result = TRUE; result = TRUE;
} }
} }
@ -559,7 +559,7 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param)
p_param.SetX(m_x); p_param.SetX(m_x);
p_param.SetY(m_y); p_param.SetY(m_y);
p_param.SetModifier(LegoEventNotificationParam::c_lButtonState); p_param.SetModifier(LegoEventNotificationParam::c_lButtonState);
p_param.SetNotification(c_notificationDragEnd); p_param.SetNotification(c_notificationDragStart);
result = TRUE; result = TRUE;
} }
else { else {

6
LEGO1/omni/include/mxnotificationparam.h
View File

@ -20,9 +20,9 @@ enum NotificationId {
c_notificationButtonDown = 9, // 100d6aa0 c_notificationButtonDown = 9, // 100d6aa0
c_notificationMouseMove = 10, // 100d6aa0 c_notificationMouseMove = 10, // 100d6aa0
c_notificationClick = 11, // 100d6aa0 c_notificationClick = 11, // 100d6aa0
c_notificationDragEnd = 12, c_notificationDragStart = 12,
c_notificationDragStart = 13, c_notificationDrag = 13,
c_notificationDrag = 14, c_notificationDragEnd = 14,
c_notificationTimer = 15, // 100d6aa0 c_notificationTimer = 15, // 100d6aa0
c_notificationControl = 17, c_notificationControl = 17,
c_notificationEndAnim = 18, // 100d7e80 c_notificationEndAnim = 18, // 100d7e80