diff --git a/LEGO1/legoutil.cpp b/LEGO1/legoutil.cpp index 9827b376..cd46c902 100644 --- a/LEGO1/legoutil.cpp +++ b/LEGO1/legoutil.cpp @@ -1,5 +1,6 @@ #include "legoutil.h" +#include "mxomni.h" #include "mxtypes.h" #include @@ -101,3 +102,9 @@ void ConvertHSVToRGB(float h, float s, float v, float *r_out, float *b_out, floa return; } } + +// OFFSET: LEGO1 0x1003ef40 +void SetAppCursor(WPARAM p_wparam) +{ + PostMessageA(MxOmni::GetInstance()->GetWindowHandle(), 0x5400, p_wparam, 0); +} diff --git a/LEGO1/legoutil.h b/LEGO1/legoutil.h index b736cd29..e912991d 100644 --- a/LEGO1/legoutil.h +++ b/LEGO1/legoutil.h @@ -1,6 +1,8 @@ #ifndef LEGOUTIL_H #define LEGOUTIL_H +#include + #include "extra.h" template @@ -23,5 +25,6 @@ inline T Max(T p_t1, T p_t2) ExtraActionType MatchActionString(const char *); void ConvertHSVToRGB(float r, float g, float b, float* out_r, float* out_g, float* out_b); +void SetAppCursor(WPARAM p_wparam); #endif // LEGOUTIL_H diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp index 17de7d73..200e5bdf 100644 --- a/LEGO1/mxomni.cpp +++ b/LEGO1/mxomni.cpp @@ -288,10 +288,4 @@ MxMusicManager* MusicManager() MxEventManager* EventManager() { return MxOmni::GetInstance()->GetEventManager(); -} - -// OFFSET: LEGO1 0x1003ef40 -void SetAppCursor(WPARAM p_wparam) -{ - PostMessageA(MxOmni::GetInstance()->GetWindowHandle(), 0x5400, p_wparam, 0); -} +} \ No newline at end of file diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h index 28e47124..a8fa9db8 100644 --- a/LEGO1/mxomni.h +++ b/LEGO1/mxomni.h @@ -92,6 +92,4 @@ __declspec(dllexport) MxNotificationManager * NotificationManager(); MxVideoManager * MVideoManager(); MxAtomIdCounterSet* AtomIdCounterSet(); -void SetAppCursor(WPARAM p_wparam); - #endif // MXOMNI_H diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/mxtransitionmanager.cpp index ea295dda..12bd0931 100644 --- a/LEGO1/mxtransitionmanager.cpp +++ b/LEGO1/mxtransitionmanager.cpp @@ -1,4 +1,5 @@ #include "mxtransitionmanager.h" +#include "legoutil.h" #include "legovideomanager.h" DECOMP_SIZE_ASSERT(MxTransitionManager, 0x900); diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/mxtransitionmanager.h index 2276219d..1b662e98 100644 --- a/LEGO1/mxtransitionmanager.h +++ b/LEGO1/mxtransitionmanager.h @@ -5,7 +5,6 @@ #include "mxvideopresenter.h" #include "legoomni.h" - // VTABLE 0x100d7ea0 class MxTransitionManager : public MxCore {