diff --git a/Engine/Source/Event/Event.h b/Engine/Source/Event/Event.h index b76c92b..a0ee74d 100644 --- a/Engine/Source/Event/Event.h +++ b/Engine/Source/Event/Event.h @@ -3,7 +3,6 @@ #include #include "Engine/Source/Event/Types.h" -#include "WoW/Source/Console/Types.h" HEVENTCONTEXT EventCreateContextEx(int32_t interactive, EVENTHANDLERFUNC initializeHandler, EVENTHANDLERFUNC destroyHandler, uint32_t idleTime, uint32_t debugFlags); void EventDestroy(); diff --git a/Engine/Source/Event/EvtInput.h b/Engine/Source/Event/EvtInput.h index 8053065..32e79df 100644 --- a/Engine/Source/Event/EvtInput.h +++ b/Engine/Source/Event/EvtInput.h @@ -5,7 +5,6 @@ #include "Engine/Source/Event/Types.h" #include "Engine/Source/Os/Input.h" #include "Engine/Source/Tempest/CRect.h" -#include "WoW/Source/Console/Types.h" class EvtContext; diff --git a/Engine/Source/Event/Types.h b/Engine/Source/Event/Types.h index 501b359..0fc1431 100644 --- a/Engine/Source/Event/Types.h +++ b/Engine/Source/Event/Types.h @@ -4,7 +4,6 @@ #include #include #include "Engine/Source/Tempest/C2Vector.h" -#include "WoW/Source/Console/Types.h" enum KEY : uint32_t { KEY_NONE = 0xFFFFFFFFFFFFFFFF, @@ -120,6 +119,32 @@ enum KEY : uint32_t { KEY_LAST = 0x313, }; +enum MOUSEBUTTON : uint32_t { + MOUSE_BUTTON_NONE = 0, + MOUSE_BUTTON_LEFT = 1, + MOUSE_BUTTON_MIDDLE = 2, + MOUSE_BUTTON_RIGHT = 4, + MOUSE_BUTTON_XBUTTON1 = 8, + MOUSE_BUTTON_XBUTTON2 = 16, + MOUSE_BUTTON_XBUTTON3 = 32, + MOUSE_BUTTON_XBUTTON4 = 64, + MOUSE_BUTTON_XBUTTON5 = 128, + MOUSE_BUTTON_XBUTTON6 = 0x100, + MOUSE_BUTTON_XBUTTON7 = 0x200, + MOUSE_BUTTON_XBUTTON8 = 0x400, + MOUSE_BUTTON_XBUTTON9 = 0x800, + MOUSE_BUTTON_XBUTTON10 = 0x1000, + MOUSE_BUTTON_XBUTTON11 = 0x2000, + MOUSE_BUTTON_XBUTTON12 = 0x4000, + MOUSE_BUTTON_ALL = 0xFFFFFFFFFFFFFFFF, +}; + +enum MOUSEMODE { + MOUSE_MODE_NORMAL = 0, + MOUSE_MODE_RELATIVE = 1, + MOUSE_MODES = 2, +}; + enum SCHEDSTATE : uint32_t { SCHEDSTATE_ACTIVE = 0, SCHEDSTATE_CLOSED = 1, diff --git a/Engine/Source/Gx/CGxDevice/CGxDevice.h b/Engine/Source/Gx/CGxDevice/CGxDevice.h index de24b1e..9a7a128 100644 --- a/Engine/Source/Gx/CGxDevice/CGxDevice.h +++ b/Engine/Source/Gx/CGxDevice/CGxDevice.h @@ -14,6 +14,7 @@ #include "Engine/Source/Gx/CGxTex.h" #include "Engine/Source/Gx/Types.h" #include "Engine/Source/Tempest/C2Vector.h" +#include "Engine/Source/Tempest/CBoundingBox.h" #include "Engine/Source/Tempest/C2iVector.h" #include "Engine/Source/Tempest/C3Vector.h" #include "Engine/Source/Tempest/C4Vector.h" @@ -22,9 +23,6 @@ #include "Engine/Source/Tempest/CImVector.h" #include "Engine/Source/Storm/H/stpl.h" #include "Engine/Source/Storm/H/Types.h" -#include "WoW/Source/Types.h" -#include "WoW/Source/WorldClient/Types.h" -#include "WoW/Source/WorldClient/World.h" #include "Engine/Source/Tempest/CRect.h" #include "Engine/Source/Tempest/CiRect.h" #include "_Triage/EmergencyMem.h" diff --git a/Engine/Source/Gx/CGxFont.h b/Engine/Source/Gx/CGxFont.h index a165571..0ec4f9b 100644 --- a/Engine/Source/Gx/CGxFont.h +++ b/Engine/Source/Gx/CGxFont.h @@ -6,7 +6,6 @@ #include #include "Engine/Source/Gxu/GxuFontMiscClasses.h" #include "Engine/Source/Storm/H/stpl.h" -#include "WoW/Common/TextureCache.h" struct CGxString; struct CHARCODEDESC; diff --git a/Engine/Source/Gxu/GxuFontMiscClasses.h b/Engine/Source/Gxu/GxuFontMiscClasses.h index 623a3d7..f5c729c 100644 --- a/Engine/Source/Gxu/GxuFontMiscClasses.h +++ b/Engine/Source/Gxu/GxuFontMiscClasses.h @@ -8,6 +8,7 @@ #include "Engine/Source/Tempest/CRect.h" class CColor; +class CGxFont; class CHARCODEDESC; struct HASHKEY_NONE; struct VERT; @@ -53,4 +54,13 @@ class TEXTURECACHEROW { /* 0004 */ TSList m_glyphlist; }; +class TEXTURECACHE { + public: + /* 0000 */ uint32_t m_texture; + /* 0004 */ CGxFont* m_theFace; + /* 0008 */ int8_t m_anyDirtyGlyphs; + /* 0009 */ int8_t m_pad [3]; + /* 000C */ TSBaseArray m_textureRows; +}; + #endif diff --git a/Engine/Source/Model2/M2Model.h b/Engine/Source/Model2/M2Model.h index 351667a..e8eebb5 100644 --- a/Engine/Source/Model2/M2Model.h +++ b/Engine/Source/Model2/M2Model.h @@ -11,7 +11,7 @@ #include "Engine/Source/Tempest/C44Matrix.h" #include "Engine/Source/Tempest/C4Quaternion.h" #include "Engine/Source/Tempest/CAaBox.h" -#include "WoW/Source/WorldClient/World.h" +#include "Engine/Source/Tempest/CRange.h" struct C3Vector; struct C44Matrix; diff --git a/Engine/Source/Os/Input.h b/Engine/Source/Os/Input.h index 8b5fe7f..12bd741 100644 --- a/Engine/Source/Os/Input.h +++ b/Engine/Source/Os/Input.h @@ -3,7 +3,6 @@ #include #include "Engine/Source/Event/Types.h" -#include "WoW/Source/Console/Types.h" struct tagRECT; diff --git a/Engine/Source/Os/Win32/Input.cpp b/Engine/Source/Os/Win32/Input.cpp index 62c6899..db7497f 100644 --- a/Engine/Source/Os/Win32/Input.cpp +++ b/Engine/Source/Os/Win32/Input.cpp @@ -11,7 +11,6 @@ #include "Engine/Source/Os/TimeManager.h" #include "Engine/Source/Storm/H/storm.h" #include "Engine/Source/Tempest/C2iVector.h" -#include "WoW/Source/Console/Types.h" #define WM_POPUPSYSTEMMENU 0x313 diff --git a/Engine/Source/Os/Win64/Input.cpp b/Engine/Source/Os/Win64/Input.cpp index fd773dd..0cdb306 100644 --- a/Engine/Source/Os/Win64/Input.cpp +++ b/Engine/Source/Os/Win64/Input.cpp @@ -11,7 +11,6 @@ #include "Engine/Source/Os/TimeManager.h" #include "Engine/Source/Storm/H/storm.h" #include "Engine/Source/Tempest/C2iVector.h" -#include "WoW/Source/Console/Types.h" #define WM_POPUPSYSTEMMENU 0x313 diff --git a/Engine/Source/Tempest/CBoundingBox.h b/Engine/Source/Tempest/CBoundingBox.h new file mode 100644 index 0000000..2a6cbd1 --- /dev/null +++ b/Engine/Source/Tempest/CBoundingBox.h @@ -0,0 +1,15 @@ +#ifndef ENGINE_SOURCE_TEMPEST_CBOUNDINGBOX_H +#define ENGINE_SOURCE_TEMPEST_CBOUNDINGBOX_H + +#include +#include +#include "Engine/Source/Tempest/CRange.h" + +class CBoundingBox { + public: + /* 0000 */ CRange m_x; + /* 0008 */ CRange m_y; + /* 0010 */ CRange m_z; +}; + +#endif diff --git a/Engine/Source/Tempest/CRange.h b/Engine/Source/Tempest/CRange.h new file mode 100644 index 0000000..79d256a --- /dev/null +++ b/Engine/Source/Tempest/CRange.h @@ -0,0 +1,13 @@ +#ifndef ENGINE_SOURCE_TEMPEST_CRANGE_H +#define ENGINE_SOURCE_TEMPEST_CRANGE_H + +#include +#include + +class CRange { + public: + /* 0000 */ float m_l; + /* 0004 */ float m_h; +}; + +#endif diff --git a/WoW/Common/TextureCache.h b/WoW/Common/TextureCache.h index 7861ad2..1f21709 100644 --- a/WoW/Common/TextureCache.h +++ b/WoW/Common/TextureCache.h @@ -10,9 +10,7 @@ class CACHEENTRY; class CAsyncObject; -class CGxFont; struct HASHKEY_NONE; -class TEXTURECACHEROW; class CACHEENTRY : public TSHashObject { public: @@ -25,13 +23,4 @@ class CACHEENTRY : public TSHashObject { /* 00B0 */ uint32_t m_flags; }; -class TEXTURECACHE { - public: - /* 0000 */ uint32_t m_texture; - /* 0004 */ CGxFont* m_theFace; - /* 0008 */ int8_t m_anyDirtyGlyphs; - /* 0009 */ int8_t m_pad [3]; - /* 000C */ TSBaseArray m_textureRows; -}; - #endif diff --git a/WoW/Source/Console/ConsoleClient.h b/WoW/Source/Console/ConsoleClient.h index a065132..0598a76 100644 --- a/WoW/Source/Console/ConsoleClient.h +++ b/WoW/Source/Console/ConsoleClient.h @@ -3,9 +3,9 @@ #include #include +#include "Engine/Source/ConsoleBase/Types.h" #include "Engine/Source/Event/Types.h" #include "Engine/Source/Storm/H/stpl.h" -#include "WoW/Source/Console/Types.h" class CGxString; class CONSOLELINE; diff --git a/WoW/Source/Ui/GameUI.h b/WoW/Source/Ui/GameUI.h index f27ffd6..1c27e83 100644 --- a/WoW/Source/Ui/GameUI.h +++ b/WoW/Source/Ui/GameUI.h @@ -4,8 +4,8 @@ #include #include #include +#include "Engine/Source/Event/Types.h" #include "Engine/Source/Tempest/C3Vector.h" -#include "WoW/Source/Console/Types.h" #include "WoW/Source/Object/WGUID.h" class CGGameUI; diff --git a/WoW/Source/Ui/WorldFrame.h b/WoW/Source/Ui/WorldFrame.h index 5942dbe..00461c9 100644 --- a/WoW/Source/Ui/WorldFrame.h +++ b/WoW/Source/Ui/WorldFrame.h @@ -8,7 +8,7 @@ #include "Engine/Source/Tempest/C3Vector.h" #include "Engine/Source/Tempest/C44Matrix.h" #include "Engine/Source/Storm/H/stpl.h" -#include "WoW/Source/Console/Types.h" +#include "Engine/Source/Event/Types.h" #include "WoW/Source/Object/WGUID.h" #include "Engine/Source/Tempest/CRect.h" diff --git a/WoW/Source/WorldClient/World.h b/WoW/Source/WorldClient/World.h index 15c4946..92924ee 100644 --- a/WoW/Source/WorldClient/World.h +++ b/WoW/Source/WorldClient/World.h @@ -3,6 +3,7 @@ #include #include +#include "Engine/Source/Tempest/CBoundingBox.h" #include "Engine/Source/Tempest/C3Vector.h" #include "Engine/Source/Event/Types.h" #include "Engine/Source/Storm/H/stpl.h" @@ -13,19 +14,6 @@ class CMapChunk; class CMapDoodadDef; class CMapDoodadDefMapChunkLink; -class CRange { - public: - /* 0000 */ float m_l; - /* 0004 */ float m_h; -}; - -class CBoundingBox { - public: - /* 0000 */ CRange m_x; - /* 0008 */ CRange m_y; - /* 0010 */ CRange m_z; -}; - class CMapDoodadDefMapChunkLink { public: /* 0000 */ uint32_t m_objectIndex;