diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h index cdd771e3..2499454f 100644 --- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h +++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h @@ -13,10 +13,10 @@ class LegoROI; class LegoEventNotificationParam : public MxNotificationParam { public: enum { - c_lButtonState = 0x01, - c_rButtonState = 0x02, - c_modKey1 = 0x04, - c_modKey2 = 0x08, + c_lButtonState = 1, + c_rButtonState = 2, + c_modKey1 = 4, + c_modKey2 = 8, }; // FUNCTION: LEGO1 0x10028690 diff --git a/LEGO1/lego/legoomni/include/legonotify.h b/LEGO1/lego/legoomni/include/legonotify.h deleted file mode 100644 index ed4218b2..00000000 --- a/LEGO1/lego/legoomni/include/legonotify.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LEGONOTIFY_H -#define LEGONOTIFY_H - -enum LegoEventNotificationParamType { - c_lButtonState = 1, - c_rButtonState = 2, - c_modKey1 = 4, - c_modKey2 = 8, -}; - -#endif // LEGONOTIFY_H diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp index da455eab..b07bb02a 100644 --- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp @@ -2,7 +2,6 @@ #include "3dmanager/lego3dmanager.h" #include "legoinputmanager.h" -#include "legonotify.h" #include "legosoundmanager.h" #include "legovideomanager.h" #include "misc.h" @@ -109,10 +108,10 @@ void LegoCameraController::OnRButtonUp(MxPoint32 p_point) // FUNCTION: LEGO1 0x10012230 void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point) { - if (p_modifier & c_lButtonState) { + if (p_modifier & LegoEventNotificationParam::c_lButtonState) { LeftDrag(p_point.GetX(), p_point.GetY()); } - else if (p_modifier & c_rButtonState) { + else if (p_modifier & LegoEventNotificationParam::c_rButtonState) { RightDrag(p_point.GetX(), p_point.GetY()); } }