diff --git a/Engine/Source/Frame/CFramePoint.cpp b/Engine/Source/Frame/CFramePoint.cpp index 58dd215..6e10262 100644 --- a/Engine/Source/Frame/CFramePoint.cpp +++ b/Engine/Source/Frame/CFramePoint.cpp @@ -20,7 +20,9 @@ void* CFramePoint::operator new(size_t bytes) noexcept { // INLINED void CFramePoint::operator delete(void* ptr) { - CFramePoint::s_framePointHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CFramePoint::s_framePointHeap.PutData(ptr, nullptr, 0); + } } // VERIFY: 494f351d manual diff --git a/Engine/Source/Frame/CLayoutFrame.cpp b/Engine/Source/Frame/CLayoutFrame.cpp index 48ce8bb..c92b7ca 100644 --- a/Engine/Source/Frame/CLayoutFrame.cpp +++ b/Engine/Source/Frame/CLayoutFrame.cpp @@ -511,7 +511,7 @@ void CLayoutFrame::SetProtectFlag(uint32_t flag) { return; } - this->m_layoutFlags = (this->m_layoutFlags & ~0x20000u) | ((flag & ~0x800u | 0x800) << 8); + this->m_layoutFlags = (this->m_layoutFlags & ~0x20000u) | (((flag & 0xF7FFu) | 0x800) << 8); this->PropagateProtectFlagToParent(flag); this->ProtectFramepoints(flag); this->m_layoutFlags &= ~0x80000u; diff --git a/Engine/Source/Frame/CSimpleButton.cpp b/Engine/Source/Frame/CSimpleButton.cpp index cdb457e..286118a 100644 --- a/Engine/Source/Frame/CSimpleButton.cpp +++ b/Engine/Source/Frame/CSimpleButton.cpp @@ -35,7 +35,9 @@ CDataAllocator CSimpleButton::s_allocator(sizeof(CSimpleButton), 100); // INLINED void CSimpleButton::operator delete(void* ptr) { - CSimpleButton::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleButton::s_allocator.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/Engine/Source/Frame/CSimpleCheckbox.cpp b/Engine/Source/Frame/CSimpleCheckbox.cpp index e04279f..2147e4c 100644 --- a/Engine/Source/Frame/CSimpleCheckbox.cpp +++ b/Engine/Source/Frame/CSimpleCheckbox.cpp @@ -27,7 +27,9 @@ CDataAllocator CSimpleCheckbox::s_allocator(sizeof(CSimpleCheckbox), 50); // INLINED void CSimpleCheckbox::operator delete(void* ptr) { - CSimpleCheckbox::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleCheckbox::s_allocator.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/Engine/Source/Frame/CSimpleColorSelect.cpp b/Engine/Source/Frame/CSimpleColorSelect.cpp index b8a1524..236ec7e 100644 --- a/Engine/Source/Frame/CSimpleColorSelect.cpp +++ b/Engine/Source/Frame/CSimpleColorSelect.cpp @@ -66,7 +66,9 @@ static void ValueTextureUpdate(EGxTexCommand command, uint32_t width, uint32_t h // INLINED void CSimpleColorSelect::operator delete(void* ptr) { - CSimpleColorSelect::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleColorSelect::s_allocator.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/Engine/Source/Frame/CSimpleEditBox.cpp b/Engine/Source/Frame/CSimpleEditBox.cpp index b5ef462..cc2114d 100644 --- a/Engine/Source/Frame/CSimpleEditBox.cpp +++ b/Engine/Source/Frame/CSimpleEditBox.cpp @@ -102,7 +102,9 @@ void CSimpleFontedFrameFont::UpdateObjects() { // INLINED void CSimpleEditBox::operator delete(void* ptr) { - CSimpleEditBox::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleEditBox::s_allocator.PutData(ptr, nullptr, 0); + } } // VERIFY: 64369d87 manual diff --git a/Engine/Source/Frame/CSimpleFrame.cpp b/Engine/Source/Frame/CSimpleFrame.cpp index 8dd35ae..c5012df 100644 --- a/Engine/Source/Frame/CSimpleFrame.cpp +++ b/Engine/Source/Frame/CSimpleFrame.cpp @@ -171,7 +171,9 @@ int32_t CSimpleFrame::GetObjectType() { // INLINED void CSimpleFrame::operator delete(void* ptr) { - CSimpleFrame::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleFrame::s_allocator.PutData(ptr, nullptr, 0); + } } // VERIFY: 6649b89d manual diff --git a/Engine/Source/Frame/CSimpleMessageScrollFrame.cpp b/Engine/Source/Frame/CSimpleMessageScrollFrame.cpp index dce39d6..04eeed0 100644 --- a/Engine/Source/Frame/CSimpleMessageScrollFrame.cpp +++ b/Engine/Source/Frame/CSimpleMessageScrollFrame.cpp @@ -185,7 +185,7 @@ void CSimpleMessageScrollFrame::UpdateNode(CSimpleMessageScrollFrameDisplayNode* node->m_string->SetText("", 1); } - if (fabs(node->m_string->GetStringHeight() - height) >= 0.001) { + if (fabs(node->m_string->GetStringHeight() - height) >= 0.001f) { node->m_string->Resize(1); } } diff --git a/Engine/Source/Frame/CSimpleModel.cpp b/Engine/Source/Frame/CSimpleModel.cpp index 21b9acc..7ecc7ae 100644 --- a/Engine/Source/Frame/CSimpleModel.cpp +++ b/Engine/Source/Frame/CSimpleModel.cpp @@ -62,7 +62,9 @@ int32_t CSimpleModel::GetObjectType() { // INLINED void CSimpleModel::operator delete(void* ptr) { - CSimpleModel::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleModel::s_allocator.PutData(ptr, nullptr, 0); + } } // VERIFY: 56a4df90 auto @@ -212,10 +214,12 @@ void CSimpleModel::SetSequence(uint32_t sequence) { // VERIFY: 5e59b8f4 auto // OFFSET: 0x0095F610 -void CSimpleModel::SetSequenceTime(uint32_t sequence, int32_t time) { +int32_t CSimpleModel::SetSequenceTime(uint32_t sequence, int32_t time) { if (this->m_model) { this->m_model->SetBoneSequence(0xFFFFFFFF, sequence, 0xFFFFFFFF, time, 1.0f, 0, 1); } + + return 1; } // VERIFY: 209c9b4c auto diff --git a/Engine/Source/Frame/CSimpleModel.h b/Engine/Source/Frame/CSimpleModel.h index facf53f..1bd02e1 100644 --- a/Engine/Source/Frame/CSimpleModel.h +++ b/Engine/Source/Frame/CSimpleModel.h @@ -83,7 +83,7 @@ class CSimpleModel : public CSimpleFrame { void SetCameraByIndex(uint32_t index); void SetLight(const CM2Light& light); void SetSequence(uint32_t sequence); - void SetSequenceTime(uint32_t sequence, int32_t time); + int32_t SetSequenceTime(uint32_t sequence, int32_t time); }; #endif diff --git a/Engine/Source/Frame/CSimpleMovieFrame.cpp b/Engine/Source/Frame/CSimpleMovieFrame.cpp index 20ac980..1958033 100644 --- a/Engine/Source/Frame/CSimpleMovieFrame.cpp +++ b/Engine/Source/Frame/CSimpleMovieFrame.cpp @@ -236,7 +236,9 @@ static void MovieTextureUpdate(EGxTexCommand command, uint32_t width, uint32_t h // INLINED void CSimpleMovieFrame::operator delete(void* ptr) { - CSimpleMovieFrame::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleMovieFrame::s_allocator.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/Engine/Source/Frame/CSimpleRender.cpp b/Engine/Source/Frame/CSimpleRender.cpp index b86ca3b..ec353a5 100644 --- a/Engine/Source/Frame/CSimpleRender.cpp +++ b/Engine/Source/Frame/CSimpleRender.cpp @@ -1030,7 +1030,9 @@ void CSimpleFontString::RefreshEmbeddedTextures() { // INLINED void CSimpleFontString::operator delete(void* ptr) { - CSimpleFontString::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleFontString::s_allocator.PutData(ptr, nullptr, 0); + } } // VERIFY: ce8bf3cc manual @@ -2013,7 +2015,9 @@ int32_t CSimpleTexture::GetObjectType() { // INLINED void CSimpleTexture::operator delete(void* ptr) { - CSimpleTexture::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleTexture::s_allocator.PutData(ptr, nullptr, 0); + } } // VERIFY: 0a77af56 auto diff --git a/Engine/Source/Frame/CSimpleScrollFrame.cpp b/Engine/Source/Frame/CSimpleScrollFrame.cpp index 5d306c2..46a154f 100644 --- a/Engine/Source/Frame/CSimpleScrollFrame.cpp +++ b/Engine/Source/Frame/CSimpleScrollFrame.cpp @@ -34,7 +34,9 @@ CDataAllocator CSimpleScrollFrame::s_allocator(sizeof(CSimpleScrollFrame), 5); // INLINED void CSimpleScrollFrame::operator delete(void* ptr) { - CSimpleScrollFrame::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleScrollFrame::s_allocator.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/Engine/Source/Frame/CSimpleStatusBar.cpp b/Engine/Source/Frame/CSimpleStatusBar.cpp index 4c2f753..9816383 100644 --- a/Engine/Source/Frame/CSimpleStatusBar.cpp +++ b/Engine/Source/Frame/CSimpleStatusBar.cpp @@ -32,7 +32,9 @@ CDataAllocator CSimpleStatusBar::s_allocator(sizeof(CSimpleStatusBar), 5); // INLINED void CSimpleStatusBar::operator delete(void* ptr) { - CSimpleStatusBar::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleStatusBar::s_allocator.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/Engine/Source/FrameXML/LoadXML.cpp b/Engine/Source/FrameXML/LoadXML.cpp index e80900c..e27243b 100644 --- a/Engine/Source/FrameXML/LoadXML.cpp +++ b/Engine/Source/FrameXML/LoadXML.cpp @@ -436,7 +436,7 @@ int32_t StringToBOOL(lua_State* L, int32_t index, int32_t defaultValue) { return lua_toboolean(L, index); case LUA_TNUMBER: - return lua_tonumber(L, index) != 0.0; + return static_cast(lua_tonumber(L, index)) != 0; case LUA_TSTRING: return StringToBOOL(lua_tolstring(L, index, nullptr), defaultValue); diff --git a/Engine/Source/FrameXML/XMLTree.cpp b/Engine/Source/FrameXML/XMLTree.cpp index 6b06347..873d1d2 100644 --- a/Engine/Source/FrameXML/XMLTree.cpp +++ b/Engine/Source/FrameXML/XMLTree.cpp @@ -168,7 +168,9 @@ void* XMLNode::operator new(size_t bytes) noexcept { // INLINED void XMLNode::operator delete(void* ptr) { - XMLNode::s_allocator.PutData(ptr, nullptr, 0); + if (ptr) { + XMLNode::s_allocator.PutData(ptr, nullptr, 0); + } } // VERIFY: c8b1abf3 manual diff --git a/Engine/Source/Gx/CGxDeviceD3d/CGxDeviceD3d.cpp b/Engine/Source/Gx/CGxDeviceD3d/CGxDeviceD3d.cpp index 2abee59..1dcadfe 100644 --- a/Engine/Source/Gx/CGxDeviceD3d/CGxDeviceD3d.cpp +++ b/Engine/Source/Gx/CGxDeviceD3d/CGxDeviceD3d.cpp @@ -52,7 +52,7 @@ const D3DBLEND CGxDeviceD3d::s_dstBlend[12] = { D3DBLEND_ZERO, D3DBLEND_ZERO, D3 const D3DTEXTUREADDRESS CGxDeviceD3d::s_wrapModes[2] = { D3DTADDRESS_CLAMP, D3DTADDRESS_WRAP }; // STATIC: 0x00A2F9CC -static const D3DTEXTUREOP s_texOp[6] = { D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_ADD, D3DTOP_SELECTARG2, D3DTOP_SUBTRACT, D3DTOP_BLENDDIFFUSEALPHA }; +static const D3DTEXTUREOP s_texOp[6] = { D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_ADD, D3DTOP_SELECTARG2, D3DTOP_BLENDCURRENTALPHA, D3DTOP_BLENDDIFFUSEALPHA }; // STATIC: 0x00A2F9E4 static const uint32_t s_texArgs[6][2] = { { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_CURRENT, D3DTA_TEXTURE }, { D3DTA_TEXTURE, D3DTA_CURRENT } }; diff --git a/Engine/Source/Gx/CGxDeviceD3d9Ex/CGxDeviceD3d9Ex.cpp b/Engine/Source/Gx/CGxDeviceD3d9Ex/CGxDeviceD3d9Ex.cpp index 290e6cf..953e1c4 100644 --- a/Engine/Source/Gx/CGxDeviceD3d9Ex/CGxDeviceD3d9Ex.cpp +++ b/Engine/Source/Gx/CGxDeviceD3d9Ex/CGxDeviceD3d9Ex.cpp @@ -50,7 +50,7 @@ const D3DBLEND CGxDeviceD3d9Ex::s_dstBlend[12] = { D3DBLEND_ZERO, D3DBLEND_ZERO, const D3DTEXTUREADDRESS CGxDeviceD3d9Ex::s_wrapModes[2] = { D3DTADDRESS_CLAMP, D3DTADDRESS_WRAP }; // STATIC: 0x00A2FBD0 -static const D3DTEXTUREOP s_texOp[6] = { D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_ADD, D3DTOP_SELECTARG2, D3DTOP_SUBTRACT, D3DTOP_BLENDDIFFUSEALPHA }; +static const D3DTEXTUREOP s_texOp[6] = { D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_ADD, D3DTOP_SELECTARG2, D3DTOP_BLENDCURRENTALPHA, D3DTOP_BLENDDIFFUSEALPHA }; // STATIC: 0x00A2FBE8 static const uint32_t s_texArgs[6][2] = { { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_TEXTURE, D3DTA_CURRENT }, { D3DTA_CURRENT, D3DTA_TEXTURE }, { D3DTA_TEXTURE, D3DTA_CURRENT } }; diff --git a/Engine/Source/Gx/CGxDeviceOpenGL/CGxDeviceOpenGl.cpp b/Engine/Source/Gx/CGxDeviceOpenGL/CGxDeviceOpenGl.cpp index ee8383c..f8abfd1 100644 --- a/Engine/Source/Gx/CGxDeviceOpenGL/CGxDeviceOpenGl.cpp +++ b/Engine/Source/Gx/CGxDeviceOpenGL/CGxDeviceOpenGl.cpp @@ -183,11 +183,9 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { return; } - float valueF = reinterpret_cast(value); - switch (state) { case Ds_DepthMask: - if (valueF == 0.0f) { + if (!value) { glDepthMask(GL_FALSE); } else { glDepthMask(GL_TRUE); @@ -220,7 +218,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { glDisable(current); } - if (valueF != 0.0f) { + if (value) { glEnable(value); } } @@ -235,7 +233,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_TexGenS0 + 5: case Ds_TexGenS0 + 6: case Ds_TexGenS0 + 7: - if (valueF == 0.0f) { + if (!value) { glDisable(GL_TEXTURE_GEN_S); } else { glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, value); @@ -255,7 +253,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_TexGenT0 + 5: case Ds_TexGenT0 + 6: case Ds_TexGenT0 + 7: - if (valueF == 0.0f) { + if (!value) { glDisable(GL_TEXTURE_GEN_T); } else { glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, value); @@ -275,7 +273,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_TexGenR0 + 5: case Ds_TexGenR0 + 6: case Ds_TexGenR0 + 7: - if (valueF == 0.0f) { + if (!value) { glDisable(GL_TEXTURE_GEN_R); } else { glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, value); @@ -295,7 +293,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_TexGenQ0 + 5: case Ds_TexGenQ0 + 6: case Ds_TexGenQ0 + 7: - if (valueF == 0.0f) { + if (!value) { glDisable(GL_TEXTURE_GEN_Q); } else { glTexGeni(GL_Q, GL_TEXTURE_GEN_MODE, value); @@ -367,7 +365,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { if (this->m_deviceStates[Ds_VertexProgram]) { GLuint index = state - Ds_VertexArray0; - if (valueF == 0.0f) { + if (!value) { glDisableVertexAttribArrayARB(index); } else { glEnableVertexAttribArrayARB(index); @@ -376,7 +374,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { GLenum clientStates[14] = { GL_VERTEX_ARRAY, 0, 0, GL_NORMAL_ARRAY, GL_COLOR_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_COORD_ARRAY }; GLenum clientState = clientStates[state - Ds_VertexArray0]; - if (valueF == 0.0f) { + if (!value) { glDisableClientState(clientState); } else { glEnableClientState(clientState); @@ -386,7 +384,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { break; case Ds_PolygonOffsetFill: - if (valueF == 0.0f) { + if (!value) { glDisable(GL_POLYGON_OFFSET_FILL); } else { glEnable(GL_POLYGON_OFFSET_FILL); @@ -395,11 +393,11 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { break; case Ds_PolygonOffset: - glPolygonOffset(-4.0f, valueF * 65536.0f * -1.0f); + glPolygonOffset(-4.0f, reinterpret_cast(value) * 65536.0f * -1.0f); break; case Ds_Blend: - if (valueF != 0.0f) { + if (value) { glEnable(GL_BLEND); } else { glDisable(GL_BLEND); @@ -408,7 +406,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { break; case Ds_AlphaTest: - if (valueF != 0.0f) { + if (value) { glEnable(GL_ALPHA_TEST); } else { glDisable(GL_ALPHA_TEST); @@ -418,7 +416,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_RegisterCombiners: if (glNVRegisterCombiners) { - if (valueF != 0.0f) { + if (value) { glEnable(GL_REGISTER_COMBINERS_NV); } else { glDisable(GL_REGISTER_COMBINERS_NV); @@ -429,7 +427,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_PerStageConstants: if (glNVRegisterCombiners2) { - if (valueF != 0.0f) { + if (value) { glEnable(GL_PER_STAGE_CONSTANTS_NV); } else { glDisable(GL_PER_STAGE_CONSTANTS_NV); @@ -440,7 +438,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_TextureShader: if (glNVTextureShader) { - if (valueF != 0.0f) { + if (value) { glEnable(GL_TEXTURE_SHADER_NV); } else { glDisable(GL_TEXTURE_SHADER_NV); @@ -451,7 +449,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { case Ds_FragmentProgram: if (glARBFragmentProgram) { - if (valueF != 0.0f) { + if (value) { glEnable(GL_FRAGMENT_PROGRAM_ARB); } else { glDisable(GL_FRAGMENT_PROGRAM_ARB); @@ -473,7 +471,7 @@ void CGxDeviceOpenGl::DsSet(EDeviceState state, uint32_t value, int32_t force) { this->m_primVertexDirty = 0xFFFFFFFF; - if (valueF == 0.0f) { + if (!value) { glDisable(GL_VERTEX_PROGRAM_ARB); } else { glEnable(GL_VERTEX_PROGRAM_ARB); @@ -2937,9 +2935,9 @@ void CGxDeviceOpenGl::IStateSyncEnables() { if (this->NeedsUpdate(this->m_appMasterEnables, this->m_hwMasterEnables, 0, 0, 8, enable)) { if (enable) { - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - } else { glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + } else { + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); } } diff --git a/Engine/Source/ShaderEffect/ShadowCache.cpp b/Engine/Source/ShaderEffect/ShadowCache.cpp index a9d4f22..e90146f 100644 --- a/Engine/Source/ShaderEffect/ShadowCache.cpp +++ b/Engine/Source/ShaderEffect/ShadowCache.cpp @@ -1073,3 +1073,9 @@ int32_t CShadowCache::Update(const C3Vector& pos, int32_t useCullFrustum) { return 1; } + +// OFFSET: 0x00876360 +int32_t CShadowCache::Initialize() { + CShadowCache::Init(); + return 1; +} diff --git a/Engine/Source/ShaderEffect/ShadowCache.h b/Engine/Source/ShaderEffect/ShadowCache.h index 71f5917..8db9a67 100644 --- a/Engine/Source/ShaderEffect/ShadowCache.h +++ b/Engine/Source/ShaderEffect/ShadowCache.h @@ -91,6 +91,7 @@ class CShadowCache { static const char* GetShadowModeDesc(uint32_t mode); static uint32_t GetShadowValue(); static void Init(); + static int32_t Initialize(); static void InitPcfOffsets(); static void __fastcall NotifyTexturesRecreate(); static void PostUpdate(); diff --git a/Engine/Source/SoundEngine/fmodex/lib/ogg_vorbis/vorbis/lib/window.c b/Engine/Source/SoundEngine/fmodex/lib/ogg_vorbis/vorbis/lib/window.c index abbab65..1672b68 100644 --- a/Engine/Source/SoundEngine/fmodex/lib/ogg_vorbis/vorbis/lib/window.c +++ b/Engine/Source/SoundEngine/fmodex/lib/ogg_vorbis/vorbis/lib/window.c @@ -152,6 +152,7 @@ static float vwin512[256]; /* = { 0.9999997377F, 0.9999999317F, 0.9999999911F, 0.9999999999F, };*/ +// STATIC: 0x00B39668 static float vwin1024[512]; /* = { 0.0000036962F, 0.0000332659F, 0.0000924041F, 0.0001811086F, 0.0002993761F, 0.0004472021F, 0.0006245811F, 0.0008315063F, diff --git a/Engine/Source/SoundEngine/fmodex/src/fmod_file_memory.cpp b/Engine/Source/SoundEngine/fmodex/src/fmod_file_memory.cpp index d834e3b..8e25c91 100644 --- a/Engine/Source/SoundEngine/fmodex/src/fmod_file_memory.cpp +++ b/Engine/Source/SoundEngine/fmodex/src/fmod_file_memory.cpp @@ -104,9 +104,9 @@ FMOD_RESULT MemoryFile::reallySeek(unsigned int pos) { mPosition = pos; - if (mPosition > mFileSize) + if (mPosition > mLength) { - mPosition = mFileSize; + mPosition = mLength; } if (mPosition < 0) { diff --git a/Engine/Source/Storm/H/stpl.h b/Engine/Source/Storm/H/stpl.h index 84e49b6..666d342 100644 --- a/Engine/Source/Storm/H/stpl.h +++ b/Engine/Source/Storm/H/stpl.h @@ -215,6 +215,7 @@ class TSHashTable { struct HASHKEY_CONSTSTR { /* 0000 */ const char* m_str; + HASHKEY_CONSTSTR& operator=(const char* str); bool operator==(const char* str); }; @@ -1012,7 +1013,7 @@ TSHashObject::~TSHashObject() { } // VERIFY: fcbebc9d auto -// OFFSET: [0x0047C7B0, 0x0047CA30, 0x00492080, 0x00496980, 0x004B83F0, 0x004BB2D0, 0x004BC7D0, 0x004BD1B0, 0x004BE4D0, 0x004C0510, 0x004C9820, 0x004CADB0, 0x004CCB80, 0x004CCD70, 0x004CE310, 0x004CF500, 0x004D5DD0, 0x004F33F0, 0x00506060, 0x005063F0, 0x00506590, 0x00506790, 0x00529680, 0x00529720, 0x005299B0, 0x0052F3D0, 0x0053F740, 0x00549010, 0x0055A190, 0x0055A3D0, 0x00560650, 0x00560800, 0x00560C10, 0x00560E70, 0x00561DA0, 0x00567670, 0x00576300, 0x00592DD0, 0x005B64C0, 0x005B6660, 0x005C15F0, 0x005C1850, 0x005C8590, 0x005C8790, 0x005D2780, 0x005F0820, 0x005F4040<_BANNEDADDON, HASHKEY_NONE>, 0x005F6050, 0x005F6210, 0x005F7240, 0x005FCDD0, 0x00618400, 0x00618630, 0x00618850, 0x00670390, 0x00670540, 0x00670730, 0x006708E0, 0x00670A90, 0x00670C40, 0x00670DF0, 0x00670FA0, 0x006711A0, 0x00671350, 0x006715C0, 0x00671770, 0x00671920, 0x00671AD0, 0x00671C80, 0x00678F70, 0x00678FA0, 0x00678FD0, 0x00679000, 0x00679030, 0x00679060, 0x00679090, 0x006790C0, 0x006790F0, 0x00679120, 0x00679150, 0x00679180, 0x006791B0, 0x006791E0, 0x00679210, 0x00688380, 0x006BC1A0, 0x006BEF80, 0x006C2C80, 0x006C30E0, 0x006C8580, 0x006E6590, 0x006E6690, 0x006F3BE0, 0x006F3D70, 0x006F4090, 0x006F4280, 0x006F5970, 0x006F5EC0, 0x006F5F70, 0x00709EC0, 0x0070A120, 0x00734760, 0x00767A00, 0x00768C70, 0x00776CC0, 0x007B0660, 0x007B7110, 0x007C0CE0, 0x007C0DD0, 0x007DD810, 0x007DDA00, 0x007E04B0, 0x007F2C20, 0x007F53D0, 0x0080A400, 0x0080A5F0, 0x00811080, 0x00811270, 0x00811400, 0x00813230, 0x008134B0, 0x0081AFA0, 0x0084A180, 0x0084B8E0, 0x00876750, 0x00877850, 0x0087C010] +// OFFSET: [0x0047C7B0, 0x0047CA30, 0x00492080, 0x00496980, 0x004B83F0, 0x004BB2D0, 0x004BC7D0, 0x004BD1B0, 0x004BE4D0, 0x004C0510, 0x004C9820, 0x004CADB0, 0x004CCB80, 0x004CCD70, 0x004CE310, 0x004CF500, 0x004D5DD0, 0x004F33F0, 0x00506060, 0x005063F0, 0x00506590, 0x00506790, 0x00529680, 0x00529720, 0x005299B0, 0x0052F3D0, 0x0053F740, 0x00549010, 0x0055A190, 0x0055A3D0, 0x00560650, 0x00560800, 0x00560C10, 0x00560E70, 0x00561DA0, 0x00567670, 0x00576300, 0x00592DD0, 0x005B64C0, 0x005B6660, 0x005C15F0, 0x005C1850, 0x005C8590, 0x005C8790, 0x005D2780, 0x005F0820, 0x005F4040<_BANNEDADDON, HASHKEY_NONE>, 0x005F6050, 0x005F6210, 0x005F7240, 0x005FCDD0, 0x00618400, 0x00618630, 0x00618850, 0x00670390, 0x00670540, 0x00670730, 0x006708E0, 0x00670A90, 0x00670C40, 0x00670DF0, 0x00670FA0, 0x006711A0, 0x00671350, 0x006715C0, 0x00671770, 0x00671920, 0x00671AD0, 0x00671C80, 0x00678F70, 0x00678FA0, 0x00678FD0, 0x00679000, 0x00679030, 0x00679060, 0x00679090, 0x006790C0, 0x006790F0, 0x00679120, 0x00679150, 0x00679180, 0x006791B0, 0x006791E0, 0x00679210, 0x00688380, 0x006BC1A0, 0x006BEF80, 0x006C2C80, 0x006C30E0, 0x006C8580, 0x006E6590, 0x006E6690, 0x006F3BE0, 0x006F3D70, 0x006F4090, 0x006F4280, 0x006F5970, 0x006F5EC0, 0x006F5F70, 0x00709EC0, 0x0070A120, 0x00734760, 0x00767A00, 0x00768C70, 0x00776CC0, 0x007B0660, 0x007B7110, 0x007C0CE0, 0x007C0DD0, 0x007DD810, 0x007DDA00, 0x007E04B0, 0x007F2C20, 0x007F53D0, 0x0080A400, 0x0080A5F0, 0x00811080, 0x00811270, 0x00811400, 0x00813230, 0x008134B0, 0x0081AFA0, 0x0084A180, 0x0084B8E0, 0x00876750, 0x00877850, 0x0087C010] template void TSHashTable::InternalDelete(T* ptr) { ptr->~T(); @@ -1020,7 +1021,7 @@ void TSHashTable::InternalDelete(T* ptr) { } // VERIFY: 2a1eed0a auto -// OFFSET: [0x0047C800, 0x0047C9D0, 0x00492020, 0x00496EB0, 0x004B92B0, 0x004BB300, 0x004BC760, 0x004BD1F0, 0x004BE550, 0x004C0540, 0x004C96C0, 0x004CAD50, 0x004CCB20, 0x004CCD10, 0x004CE340, 0x004CF530, 0x004D65E0, 0x004F34B0, 0x00506090, 0x00506380, 0x005065D0, 0x005067D0, 0x00529610, 0x005296C0, 0x005299F0, 0x0052F360, 0x0053F6D0, 0x00548FB0, 0x0055A250, 0x0055A400, 0x00560690, 0x00560840, 0x00560A90, 0x00560C40, 0x00560E10, 0x005676A0, 0x005762A0, 0x00592D70, 0x005B6450, 0x005B65F0, 0x005C1620, 0x005C17F0, 0x005C85C0, 0x005C87C0, 0x005D2710, 0x005F07B0, 0x005F4070<_BANNEDADDON, HASHKEY_NONE>, 0x005F6090, 0x005F61B0, 0x005F7270, 0x005FCE10, 0x00618380, 0x006185B0, 0x006187E0, 0x00670270, 0x00670330, 0x00670420, 0x006704E0, 0x00670650, 0x006706D0, 0x006707C0, 0x00670880, 0x00670970, 0x00670A30, 0x00670B20, 0x00670BE0, 0x00670CD0, 0x00670D90, 0x00670E80, 0x00670F40, 0x006710C0, 0x00671140, 0x00671230, 0x006712F0, 0x006713E0, 0x00671560, 0x00671650, 0x00671710, 0x00671800, 0x006718C0, 0x006719B0, 0x00671A70, 0x00671B60, 0x00671C20, 0x00688430, 0x006BC1D0, 0x006BEFB0, 0x006C2CB0, 0x006C3110, 0x006C85B0, 0x006E6520, 0x006E6630, 0x006F3B70, 0x006F3D10, 0x006F4020, 0x006F42B0, 0x006F59A0, 0x006F5F00, 0x006F5FA0, 0x00709F00, 0x0070A0C0, 0x00734700, 0x00767A50, 0x00768CA0, 0x00776C40, 0x007B0800, 0x007B7180, 0x007C0D10, 0x007C0E00, 0x007DD7B0, 0x007DD9A0, 0x007E0450, 0x007F2C50, 0x007F5370, 0x0080A3A0, 0x0080A590, 0x00811020, 0x00811210, 0x00811430, 0x00813280, 0x00813450, 0x0081AF40, 0x0084A100, 0x0084B880, 0x00876780, 0x008778B0, 0x0087C040] +// OFFSET: [0x0047C800, 0x0047C9D0, 0x00492020, 0x00496EB0, 0x004B92B0, 0x004BB300, 0x004BC760, 0x004BD1F0, 0x004BE550, 0x004C0540, 0x004C96C0, 0x004CAD50, 0x004CCB20, 0x004CCD10, 0x004CE340, 0x004CF530, 0x004D65E0, 0x004F34B0, 0x00506090, 0x00506380, 0x005065D0, 0x005067D0, 0x00529610, 0x005296C0, 0x005299F0, 0x0052F360, 0x0053F6D0, 0x00548FB0, 0x0055A250, 0x0055A400, 0x00560690, 0x00560840, 0x00560A90, 0x00560C40, 0x00560E10, 0x005676A0, 0x005762A0, 0x00592D70, 0x005B6450, 0x005B65F0, 0x005C1620, 0x005C17F0, 0x005C85C0, 0x005C87C0, 0x005D2710, 0x005F07B0, 0x005F4070<_BANNEDADDON, HASHKEY_NONE>, 0x005F6090, 0x005F61B0, 0x005F7270, 0x005FCE10, 0x00618380, 0x006185B0, 0x006187E0, 0x00670270, 0x00670330, 0x00670420, 0x006704E0, 0x00670650, 0x006706D0, 0x006707C0, 0x00670880, 0x00670970, 0x00670A30, 0x00670B20, 0x00670BE0, 0x00670CD0, 0x00670D90, 0x00670E80, 0x00670F40, 0x006710C0, 0x00671140, 0x00671230, 0x006712F0, 0x006713E0, 0x00671560, 0x00671650, 0x00671710, 0x00671800, 0x006718C0, 0x006719B0, 0x00671A70, 0x00671B60, 0x00671C20, 0x00688430, 0x006BC1D0, 0x006BEFB0, 0x006C2CB0, 0x006C3110, 0x006C85B0, 0x006E6520, 0x006E6630, 0x006F3B70, 0x006F3D10, 0x006F4020, 0x006F42B0, 0x006F59A0, 0x006F5F00, 0x006F5FA0, 0x00709F00, 0x0070A0C0, 0x00734700, 0x00767A50, 0x00768CA0, 0x00776C40, 0x007B0800, 0x007B7180, 0x007C0D10, 0x007C0E00, 0x007DD7B0, 0x007DD9A0, 0x007E0450, 0x007F2C50, 0x007F5370, 0x0080A3A0, 0x0080A590, 0x00811020, 0x00811210, 0x00811430, 0x00813280, 0x00813450, 0x0081AF40, 0x0084A100, 0x0084B880, 0x00876780, 0x008778B0, 0x0087C040] template T* TSHashTable::InternalNew(TSExplicitList* listptr, size_t extrabytes, uint32_t flags) { return listptr->NewNode(1, extrabytes, flags); @@ -1034,7 +1035,7 @@ TSHashTable::~TSHashTable() { } // VERIFY: 8328884c auto -// OFFSET: [0x0047C750, 0x0047C970, 0x00491FC0, 0x00496920, 0x004B8390, 0x004BB270, 0x004BC870, 0x004BC8D0, 0x004BE470, 0x004C04B0, 0x004CACF0, 0x004CCAC0, 0x004CCCB0, 0x004CE2B0, 0x004CF430, 0x004D5D70, 0x004F3390, 0x00506000, 0x00506320, 0x00506530, 0x00506730, 0x005295B0, 0x00529950, 0x0052F300, 0x0053F670, 0x00548F50, 0x0055A130, 0x0055A370, 0x005605F0, 0x005609A0, 0x00560BB0, 0x00560DB0, 0x00567610, 0x00576240, 0x00592D10, 0x005B63F0, 0x005C1790, 0x005C8530, 0x005C8730, 0x005D26B0, 0x005F0750, 0x005F3FE0<_BANNEDADDON, HASHKEY_NONE>, 0x005F6150, 0x005F6340, 0x005F63A0, 0x005FCD70, 0x00618320, 0x00618550, 0x00618780, 0x00670210, 0x006702D0, 0x006703C0, 0x00670480, 0x00670570, 0x00670670, 0x00670760, 0x00670820, 0x00670910, 0x006709D0, 0x00670AC0, 0x00670B80, 0x00670C70, 0x00670D30, 0x00670E20, 0x00670EE0, 0x00670FD0, 0x006710E0, 0x006711D0, 0x00671290, 0x00671380, 0x00671440, 0x006715F0, 0x006716B0, 0x006717A0, 0x00671860, 0x00671950, 0x00671A10, 0x00671B00, 0x00671BC0, 0x006BC140, 0x006BEF20, 0x006C2BE0, 0x006C3080, 0x006C8520, 0x006E64C0, 0x006E65D0, 0x006F3E00, 0x006F3E60, 0x006F3FC0, 0x006F41C0, 0x006F4410, 0x006F45D0, 0x006F4630, 0x00709E60, 0x0070A060, 0x007346A0, 0x007679A0, 0x00768C10, 0x0076D370, 0x00776B60, 0x007B0600, 0x007B70B0, 0x007C0C80, 0x007C0D70, 0x007DD750, 0x007DD940, 0x007E03F0, 0x007F2BC0, 0x007F5310, 0x0080A340, 0x0080A530, 0x00810FC0, 0x008111B0, 0x008113A0, 0x008131D0, 0x008133F0, 0x0081AE80, 0x0084A0A0, 0x0084B820, 0x008766F0, 0x008777F0, 0x0087BFB0] +// OFFSET: [0x0047C750, 0x0047C970, 0x00491FC0, 0x00496920, 0x004B8390, 0x004BB270, 0x004BC870, 0x004BC8D0, 0x004BE470, 0x004C04B0, 0x004CACF0, 0x004CCAC0, 0x004CCCB0, 0x004CE2B0, 0x004CF430, 0x004D5D70, 0x004F3390, 0x00506000, 0x00506320, 0x00506530, 0x00506730, 0x005295B0, 0x00529950, 0x0052F300, 0x0053F670, 0x00548F50, 0x0055A130, 0x0055A370, 0x005605F0, 0x005609A0, 0x00560BB0, 0x00560DB0, 0x00567610, 0x00576240, 0x00592D10, 0x005B63F0, 0x005C1790, 0x005C8530, 0x005C8730, 0x005D26B0, 0x005F0750, 0x005F3FE0<_BANNEDADDON, HASHKEY_NONE>, 0x005F6150, 0x005F6340, 0x005F63A0, 0x005FCD70, 0x00618320, 0x00618550, 0x00618780, 0x00670210, 0x006702D0, 0x006703C0, 0x00670480, 0x00670570, 0x00670670, 0x00670760, 0x00670820, 0x00670910, 0x006709D0, 0x00670AC0, 0x00670B80, 0x00670C70, 0x00670D30, 0x00670E20, 0x00670EE0, 0x00670FD0, 0x006710E0, 0x006711D0, 0x00671290, 0x00671380, 0x00671440, 0x006715F0, 0x006716B0, 0x006717A0, 0x00671860, 0x00671950, 0x00671A10, 0x00671B00, 0x00671BC0, 0x006BC140, 0x006BEF20, 0x006C2BE0, 0x006C3080, 0x006C8520, 0x006E64C0, 0x006E65D0, 0x006F3E00, 0x006F3E60, 0x006F3FC0, 0x006F41C0, 0x006F4410, 0x006F45D0, 0x006F4630, 0x00709E60, 0x0070A060, 0x007346A0, 0x007679A0, 0x00768C10, 0x0076D370, 0x00776B60, 0x007B0600, 0x007B70B0, 0x007C0C80, 0x007C0D70, 0x007DD750, 0x007DD940, 0x007E03F0, 0x007F2BC0, 0x007F5310, 0x0080A340, 0x0080A530, 0x00810FC0, 0x008111B0, 0x008113A0, 0x008131D0, 0x008133F0, 0x0081AE80, 0x0084A0A0, 0x0084B820, 0x008766F0, 0x008777F0, 0x0087BFB0] template TSHashTable::TSHashTable() { this->m_fullnessIndicator = 0; @@ -1049,7 +1050,7 @@ void TSHashTable::Clear() { } // VERIFY: 05dc3778 auto -// OFFSET: [0x0047C910, 0x0047CB00, 0x00492260, 0x00496B70, 0x004B8580, 0x004BB4B0, 0x004BC810, 0x004BC9D0, 0x004BE660, 0x004C0930, 0x004C9790, 0x004CAEA0, 0x004CCC50, 0x004CCE40, 0x004CE460, 0x004CF630, 0x004D60E0, 0x004F3570, 0x005061B0, 0x005064D0, 0x005066D0, 0x005068D0, 0x005297F0, 0x005298F0, 0x00529B00, 0x0052F4A0, 0x0053F810, 0x005490E0, 0x0055A310, 0x0055A520, 0x005607A0, 0x00560940, 0x00560B50, 0x00560D50, 0x00560F40, 0x005677A0, 0x005763D0, 0x00592EA0, 0x005B6590, 0x005B6730, 0x005C1730, 0x005C1920, 0x005C86D0, 0x005C88C0, 0x005D2860, 0x005F08F0, 0x005F4180<_BANNEDADDON, HASHKEY_NONE>, 0x005F60F0, 0x005F62E0, 0x005F64A0, 0x005FCF10, 0x006184F0, 0x00618720, 0x00618940, 0x00672D40, 0x00672EF0, 0x00672FF0, 0x006731A0, 0x006732A0, 0x00673450, 0x00673550, 0x00673700, 0x00673800, 0x006739B0, 0x00673AB0, 0x00673C70, 0x00673D70, 0x00673F10, 0x00674010, 0x006741B0, 0x006742B0, 0x00674460, 0x00674560, 0x00674710, 0x00674810, 0x006749B0, 0x00674AB0, 0x00674C50, 0x00674D50, 0x00674EF0, 0x00674FF0, 0x00675190, 0x00675290, 0x00675450, 0x00688600, 0x006BC430, 0x006BF0D0, 0x006C2DD0, 0x006C3220, 0x006C86C0, 0x006E6760, 0x006E6860, 0x006F3C10, 0x006F3DA0, 0x006F3F60, 0x006F4160, 0x006F43B0, 0x006F4570, 0x006F4730, 0x0070A000, 0x0070A1F0, 0x007349B0, 0x00767C60, 0x00768DA0, 0x00776EA0, 0x007B0900, 0x007B7290, 0x007C0F00, 0x007C1000, 0x007DD8E0, 0x007DDAD0, 0x007E0580, 0x007F2D60, 0x007F54A0, 0x0080A4D0, 0x0080A6C0, 0x00811150, 0x00811340, 0x00811540, 0x00813390, 0x00813580, 0x0081B070, 0x0084A250, 0x0084B9B0, 0x00876880, 0x008779B0, 0x0087C140] +// OFFSET: [0x0047C910, 0x0047CB00, 0x00492260, 0x00496B70, 0x004B8580, 0x004BB4B0, 0x004BC810, 0x004BC9D0, 0x004BE660, 0x004C0930, 0x004C9790, 0x004CAEA0, 0x004CCC50, 0x004CCE40, 0x004CE460, 0x004CF630, 0x004D60E0, 0x004F3570, 0x005061B0, 0x005064D0, 0x005066D0, 0x005068D0, 0x005297F0, 0x005298F0, 0x00529B00, 0x0052F4A0, 0x0053F810, 0x005490E0, 0x0055A310, 0x0055A520, 0x005607A0, 0x00560940, 0x00560B50, 0x00560D50, 0x00560F40, 0x005677A0, 0x005763D0, 0x00592EA0, 0x005B6590, 0x005B6730, 0x005C1730, 0x005C1920, 0x005C86D0, 0x005C88C0, 0x005D2860, 0x005F08F0, 0x005F4180<_BANNEDADDON, HASHKEY_NONE>, 0x005F60F0, 0x005F62E0, 0x005F64A0, 0x005FCF10, 0x006184F0, 0x00618720, 0x00618940, 0x00672D40, 0x00672EF0, 0x00672FF0, 0x006731A0, 0x006732A0, 0x00673450, 0x00673550, 0x00673700, 0x00673800, 0x006739B0, 0x00673AB0, 0x00673C70, 0x00673D70, 0x00673F10, 0x00674010, 0x006741B0, 0x006742B0, 0x00674460, 0x00674560, 0x00674710, 0x00674810, 0x006749B0, 0x00674AB0, 0x00674C50, 0x00674D50, 0x00674EF0, 0x00674FF0, 0x00675190, 0x00675290, 0x00675450, 0x00688600, 0x006BC430, 0x006BF0D0, 0x006C2DD0, 0x006C3220, 0x006C86C0, 0x006E6760, 0x006E6860, 0x006F3C10, 0x006F3DA0, 0x006F3F60, 0x006F4160, 0x006F43B0, 0x006F4570, 0x006F4730, 0x0070A000, 0x0070A1F0, 0x007349B0, 0x00767C60, 0x00768DA0, 0x00776EA0, 0x007B0900, 0x007B7290, 0x007C0F00, 0x007C1000, 0x007DD8E0, 0x007DDAD0, 0x007E0580, 0x007F2D60, 0x007F54A0, 0x0080A4D0, 0x0080A6C0, 0x00811150, 0x00811340, 0x00811540, 0x00813390, 0x00813580, 0x0081B070, 0x0084A250, 0x0084B9B0, 0x00876880, 0x008779B0, 0x0087C140] template void TSHashTable::Destroy() { this->InternalClear(1); @@ -1083,7 +1084,7 @@ T* TSHashTable::Next(T* ptr) { } // VERIFY: 35086749 auto -// OFFSET: [0x00492C70, 0x00496CE0, 0x004B9000, 0x004BB800, 0x004BCB50, 0x004BCD20, 0x004BE750, 0x004C0A20, 0x004CAF90, 0x004CCFC0, 0x004CD190, 0x004CE550, 0x004CF720, 0x004D6800, 0x004F3660, 0x00506AB0, 0x00506D40, 0x00506F10, 0x005070E0, 0x00529D90, 0x00529F60, 0x0052A240, 0x0052F590, 0x0053F900, 0x005491D0, 0x0055A6A0, 0x0055A870, 0x00561270, 0x00561440, 0x00561610, 0x005617E0, 0x005619B0, 0x005679A0, 0x005764C0, 0x00593110, 0x005B68B0, 0x005B6A80, 0x005C1AA0, 0x005C1C70, 0x005C8A40, 0x005C8C10, 0x005D2950, 0x005F09E0, 0x005F4270<_BANNEDADDON, HASHKEY_NONE>, 0x005F66B0, 0x005F6880, 0x005F6A50, 0x005FD000, 0x00618AF0, 0x00618CC0, 0x00618EF0, 0x00675AB0, 0x006773F0, 0x006775C0, 0x00677790, 0x00677960, 0x00677B30, 0x00677D00, 0x00677ED0, 0x006780A0, 0x00678270, 0x00678440, 0x00678610, 0x006787E0, 0x006789B0, 0x00678B80, 0x00678D50, 0x006894C0, 0x006BC520, 0x006C3370, 0x006C3540, 0x006C5B40, 0x006C87B0, 0x006E74A0, 0x006E7670, 0x006F4B80, 0x006F4D50, 0x006F4F20, 0x006F50F0, 0x006F52C0, 0x006F5490, 0x006F5660, 0x0070A310, 0x0070A540, 0x007378D0, 0x00767D50, 0x00768E90, 0x0076D430, 0x00777120, 0x007B09F0, 0x007BE580, 0x007BE760, 0x007DDC50, 0x007DDE20, 0x007E0670, 0x007F2E50, 0x007F5590, 0x0080A840, 0x0080AA10, 0x00811720, 0x008118F0, 0x00811AC0, 0x00813700, 0x008138D0, 0x0081B160, 0x0084BB00, 0x0084BCD0, 0x0086F280, 0x00876970, 0x0087C230] +// OFFSET: [0x00492C70, 0x00496CE0, 0x004B9000, 0x004BB800, 0x004BCB50, 0x004BCD20, 0x004BE750, 0x004C0A20, 0x004CAF90, 0x004CCFC0, 0x004CD190, 0x004CE550, 0x004CF720, 0x004D6800, 0x004F3660, 0x00506AB0, 0x00506D40, 0x00506F10, 0x005070E0, 0x00529D90, 0x00529F60, 0x0052A240, 0x0052F590, 0x0053F900, 0x005491D0, 0x0055A6A0, 0x0055A870, 0x00561270, 0x00561440, 0x00561610, 0x005617E0, 0x005619B0, 0x005679A0, 0x005764C0, 0x00593110, 0x005B68B0, 0x005B6A80, 0x005C1AA0, 0x005C1C70, 0x005C8A40, 0x005C8C10, 0x005D2950, 0x005F09E0, 0x005F4270<_BANNEDADDON, HASHKEY_NONE>, 0x005F66B0, 0x005F6880, 0x005F6A50, 0x005FD000, 0x00618AF0, 0x00618CC0, 0x00618EF0, 0x00675AB0, 0x006773F0, 0x006775C0, 0x00677790, 0x00677960, 0x00677B30, 0x00677D00, 0x00677ED0, 0x006780A0, 0x00678270, 0x00678440, 0x00678610, 0x006787E0, 0x006789B0, 0x00678B80, 0x00678D50, 0x006894C0, 0x006BC520, 0x006C3370, 0x006C3540, 0x006C5B40, 0x006C87B0, 0x006E74A0, 0x006E7670, 0x006F4B80, 0x006F4D50, 0x006F4F20, 0x006F50F0, 0x006F52C0, 0x006F5490, 0x006F5660, 0x0070A310, 0x0070A540, 0x007378D0, 0x00767D50, 0x00768E90, 0x0076D430, 0x00777120, 0x007B09F0, 0x007BE580, 0x007BE760, 0x007DDC50, 0x007DDE20, 0x007E0670, 0x007F2E50, 0x007F5590, 0x0080A840, 0x0080AA10, 0x00811720, 0x008118F0, 0x00811AC0, 0x00813700, 0x008138D0, 0x0081B160, 0x0084BB00, 0x0084BCD0, 0x0086F280, 0x00876970, 0x0087C230] template void TSHashTable::GrowListArray(uint32_t newarraysize) { uint32_t oldarraysize = this->m_slotmask + 1; @@ -1122,7 +1123,7 @@ T* TSHashTable::Head() { } // VERIFY: f91710d3 manual -// OFFSET: [0x00492C10, 0x00496C80, 0x004B8FA0, 0x004BB7A0, 0x004BCA90, 0x004BCAF0, 0x004BE6F0, 0x004C09C0, 0x004CAF30, 0x004CCF00, 0x004CCF60, 0x004CE4F0, 0x004CF6C0, 0x004D67A0, 0x004F3600, 0x005069F0, 0x00506A50, 0x00506C80, 0x00506CE0, 0x00529CD0, 0x00529D30, 0x0052A1E0, 0x0052F530, 0x0053F8A0, 0x00549170, 0x0055A5E0, 0x0055A640, 0x00561090, 0x005610F0, 0x00561150, 0x005611B0, 0x00561210, 0x00567940, 0x00576460, 0x005930B0, 0x005B67F0, 0x005B6850, 0x005C19E0, 0x005C1A40, 0x005C8980, 0x005C89E0, 0x005D28F0, 0x005F0980, 0x005F4210<_BANNEDADDON, HASHKEY_NONE>, 0x005F6590, 0x005F65F0, 0x005F6650, 0x005FCFA0, 0x00618A30, 0x00618A90, 0x00618E90, 0x00675A50, 0x00676E50, 0x00676EB0, 0x00676F10, 0x00676F70, 0x00676FD0, 0x00677030, 0x00677090, 0x006770F0, 0x00677150, 0x006771B0, 0x00677210, 0x00677270, 0x006772D0, 0x00677330, 0x00677390, 0x00689460, 0x006BC4C0, 0x006C32B0, 0x006C3310, 0x006C5AE0, 0x006C8750, 0x006E73E0, 0x006E7440, 0x006F48E0, 0x006F4940, 0x006F49A0, 0x006F4A00, 0x006F4A60, 0x006F4AC0, 0x006F4B20, 0x0070A2B0, 0x0070A4E0, 0x00737870, 0x00767CF0, 0x00768E30, 0x0076D3D0, 0x007770C0, 0x007B0990, 0x007BE4C0, 0x007BE520, 0x007DDB90, 0x007DDBF0, 0x007E0610, 0x007F2DF0, 0x007F5530, 0x0080A780, 0x0080A7E0, 0x00811600, 0x00811660, 0x008116C0, 0x00813640, 0x008136A0, 0x0081B100, 0x0084BA40, 0x0084BAA0, 0x0086F220, 0x00876910, 0x0087C1D0] +// OFFSET: [0x00492C10, 0x00496C80, 0x004B8FA0, 0x004BB7A0, 0x004BCA90, 0x004BCAF0, 0x004BE6F0, 0x004C09C0, 0x004CAF30, 0x004CCF00, 0x004CCF60, 0x004CE4F0, 0x004CF6C0, 0x004D67A0, 0x004F3600, 0x005069F0, 0x00506A50, 0x00506C80, 0x00506CE0, 0x00529CD0, 0x00529D30, 0x0052A1E0, 0x0052F530, 0x0053F8A0, 0x00549170, 0x0055A5E0, 0x0055A640, 0x00561090, 0x005610F0, 0x00561150, 0x005611B0, 0x00561210, 0x00567940, 0x00576460, 0x005930B0, 0x005B67F0, 0x005B6850, 0x005C19E0, 0x005C1A40, 0x005C8980, 0x005C89E0, 0x005D28F0, 0x005F0980, 0x005F4210<_BANNEDADDON, HASHKEY_NONE>, 0x005F6590, 0x005F65F0, 0x005F6650, 0x005FCFA0, 0x00618A30, 0x00618A90, 0x00618E90, 0x00675A50, 0x00676E50, 0x00676EB0, 0x00676F10, 0x00676F70, 0x00676FD0, 0x00677030, 0x00677090, 0x006770F0, 0x00677150, 0x006771B0, 0x00677210, 0x00677270, 0x006772D0, 0x00677330, 0x00677390, 0x00689460, 0x006BC4C0, 0x006C32B0, 0x006C3310, 0x006C5AE0, 0x006C8750, 0x006E73E0, 0x006E7440, 0x006F48E0, 0x006F4940, 0x006F49A0, 0x006F4A00, 0x006F4A60, 0x006F4AC0, 0x006F4B20, 0x0070A2B0, 0x0070A4E0, 0x00737870, 0x00767CF0, 0x00768E30, 0x0076D3D0, 0x007770C0, 0x007B0990, 0x007BE4C0, 0x007BE520, 0x007DDB90, 0x007DDBF0, 0x007E0610, 0x007F2DF0, 0x007F5530, 0x0080A780, 0x0080A7E0, 0x00811600, 0x00811660, 0x008116C0, 0x00813640, 0x008136A0, 0x0081B100, 0x0084BA40, 0x0084BAA0, 0x0086F220, 0x00876910, 0x0087C1D0] template void TSHashTable::Initialize() { this->m_slotmask = 3; @@ -1217,7 +1218,7 @@ T* TSHashTable::InternalNewNode(uint32_t hashval, size_t extrabytes, ui } // VERIFY: 96f0e432 manual -// OFFSET: [0x00492E70, 0x00496ED0, 0x004B9310, 0x004BB9D0, 0x004BD010, 0x004BD0B0, 0x004BE920, 0x004C0DC0, 0x004CB310, 0x004CD360, 0x004CD400, 0x004CE720, 0x004CF8F0, 0x004D69D0, 0x004F3830, 0x00507E10, 0x00507EB0, 0x00507F50, 0x00507FF0, 0x0052A410, 0x0052A4B0, 0x0052A550, 0x0052F910, 0x005405B0, 0x005493A0, 0x0055AC40, 0x0055ACE0, 0x00561DD0, 0x00561E70, 0x00561F10, 0x00561FB0, 0x00562050, 0x00567B70, 0x00576690, 0x00593830, 0x005B6C50, 0x005B6CF0, 0x005C1EF0, 0x005C1F90, 0x005C8E50, 0x005C8EF0, 0x005D2B20, 0x005F0D50, 0x005F4440<_BANNEDADDON, HASHKEY_NONE>, 0x005F7060, 0x005F7100, 0x005F71A0, 0x005FD220, 0x006190C0, 0x00619160, 0x00619200, 0x00679240, 0x006793D0, 0x00679470, 0x00679510, 0x006795B0, 0x00679650, 0x006796F0, 0x00679790, 0x00679830, 0x006798D0, 0x00679970, 0x00679A10, 0x00679AB0, 0x00679B50, 0x00679BF0, 0x00679C90, 0x006896C0, 0x006BC8C0, 0x006C3820, 0x006C38C0, 0x006C5D10, 0x006C8980, 0x006E7900, 0x006E79A0, 0x006F5A00, 0x006F5AA0, 0x006F5B40, 0x006F5BE0, 0x006F5C80, 0x006F5D80, 0x006F5E20, 0x0070A710, 0x0070A7B0, 0x0073A7F0, 0x00767F20, 0x00769060, 0x0076D6A0, 0x00777380, 0x007B0BC0, 0x007BE930, 0x007BE9D0, 0x007DF2D0, 0x007DF370, 0x007E0840, 0x007F3020, 0x007F5B00, 0x0080C650, 0x0080C6F0, 0x00811D40, 0x00811DE0, 0x00811E80, 0x00813AA0, 0x00813B40, 0x0081B550, 0x0084BEA0, 0x0084BF40, 0x0086F450, 0x00876B40, 0x0087C670] +// OFFSET: [0x00492E70, 0x00496ED0, 0x004B9310, 0x004BB9D0, 0x004BD010, 0x004BD0B0, 0x004BE920, 0x004C0DC0, 0x004CB310, 0x004CD360, 0x004CD400, 0x004CE720, 0x004CF8F0, 0x004D69D0, 0x004F3830, 0x00507E10, 0x00507EB0, 0x00507F50, 0x00507FF0, 0x0052A410, 0x0052A4B0, 0x0052A550, 0x0052F910, 0x005405B0, 0x005493A0, 0x0055AC40, 0x0055ACE0, 0x00561DD0, 0x00561E70, 0x00561F10, 0x00561FB0, 0x00562050, 0x00567B70, 0x00576690, 0x00593830, 0x005B6C50, 0x005B6CF0, 0x005C1EF0, 0x005C1F90, 0x005C8E50, 0x005C8EF0, 0x005D2B20, 0x005F0D50, 0x005F4440<_BANNEDADDON, HASHKEY_NONE>, 0x005F7060, 0x005F7100, 0x005F71A0, 0x005FD220, 0x006190C0, 0x00619160, 0x00619200, 0x00679240, 0x006793D0, 0x00679470, 0x00679510, 0x006795B0, 0x00679650, 0x006796F0, 0x00679790, 0x00679830, 0x006798D0, 0x00679970, 0x00679A10, 0x00679AB0, 0x00679B50, 0x00679BF0, 0x00679C90, 0x006896C0, 0x006BC8C0, 0x006C3820, 0x006C38C0, 0x006C5D10, 0x006C8980, 0x006E7900, 0x006E79A0, 0x006F5A00, 0x006F5AA0, 0x006F5B40, 0x006F5BE0, 0x006F5C80, 0x006F5D80, 0x006F5E20, 0x0070A710, 0x0070A7B0, 0x0073A7F0, 0x00767F20, 0x00769060, 0x0076D6A0, 0x00777380, 0x007B0BC0, 0x007BE930, 0x007BE9D0, 0x007DF2D0, 0x007DF370, 0x007E0840, 0x007F3020, 0x007F5B00, 0x0080C650, 0x0080C6F0, 0x00811D40, 0x00811DE0, 0x00811E80, 0x00813AA0, 0x00813B40, 0x0081B550, 0x0084BEA0, 0x0084BF40, 0x0086F450, 0x00876B40, 0x0087C670] template int32_t TSHashTable::MonitorFullness(uint32_t slot) { if (this->m_slotmask >= 0x1FFF) { @@ -1286,7 +1287,7 @@ T* TSHashTable::Ptr(uint32_t hashval, const TKey& key) { } // VERIFY: fca99b11 manual -// OFFSET: [0x004BC410, 0x004BE0E0, 0x0053F3B0, 0x0055F4D0, 0x00617C50, 0x00687870, 0x006C8100, 0x007E0250] +// OFFSET: [0x004BC410, 0x004BE0E0, 0x0053F3B0, 0x0055F4D0, 0x00617C50, 0x00687870, 0x006C8100, 0x007E0250] template T* TSHashTable::Ptr(const char* str) { if (this->m_slotmask == 0xFFFFFFFF) { @@ -1493,6 +1494,12 @@ inline bool HASHKEY_CONSTSTR::operator==(const char* str) { return this->m_str == str || SStrCmp(this->m_str, str, STORM_MAX_STR) == 0; } +// INLINED +inline HASHKEY_CONSTSTR& HASHKEY_CONSTSTR::operator=(const char* str) { + this->m_str = str; + return *this; +} + // INLINED inline HASHKEY_CONSTSTRI& HASHKEY_CONSTSTRI::operator=(const char* str) { this->m_str = str; diff --git a/Engine/Source/Storm/Source/Win32/SErr.cpp b/Engine/Source/Storm/Source/Win32/SErr.cpp index 86e423b..db81e57 100644 --- a/Engine/Source/Storm/Source/Win32/SErr.cpp +++ b/Engine/Source/Storm/Source/Win32/SErr.cpp @@ -129,7 +129,7 @@ static char s_logLastFile[MAX_PATH]; // INLINED template T* TSListWinHeap::NewNode(uint32_t location, size_t extrabytes, uint32_t flags) { - T* node = new (HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(T) + extrabytes)) T; + T* node = new (HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(T) + extrabytes)) T; memset(node, 0, sizeof(T) + extrabytes); if (location) { @@ -170,7 +170,7 @@ static void AddStormFacility(uint16_t facility) { tail = &src->next; } - *tail = static_cast<_MSGSRC*>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(_MSGSRC))); + *tail = static_cast<_MSGSRC*>(HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(_MSGSRC))); (*tail)->facility = facility; (*tail)->module = StormGetInstance(); (*tail)->next = nullptr; diff --git a/Engine/Source/Storm/Source/Win32/SLock.cpp b/Engine/Source/Storm/Source/Win32/SLock.cpp index 1a0fcf7..cee8841 100644 --- a/Engine/Source/Storm/Source/Win32/SLock.cpp +++ b/Engine/Source/Storm/Source/Win32/SLock.cpp @@ -36,15 +36,15 @@ static CInitCritSect s_refCritsect; template CDebugLockEntry TDebugLock::s_entries[256]; -// STATIC: [0x00CB71C8, 0x00CB71F0] +// STATIC: [0x00CB71C8, 0x00CB71F0] template uint32_t TDebugLock::s_freeEntry; -// STATIC: [0x00CB71CC, 0x00CB71F4] +// STATIC: [0x00CB71CC, 0x00CB71F4] template CInitCritSect TDebugLock::s_critsect; -// STATIC: [0x00CB71EC, 0x00CB7214] +// STATIC: [0x00CB71EC, 0x00CB7214] template CDebugLock* TDebugLock::s_lockList; diff --git a/Engine/Source/Storm/Source/Win64/SErr.cpp b/Engine/Source/Storm/Source/Win64/SErr.cpp index 9407a05..4f2ed1a 100644 --- a/Engine/Source/Storm/Source/Win64/SErr.cpp +++ b/Engine/Source/Storm/Source/Win64/SErr.cpp @@ -129,7 +129,7 @@ static char s_logLastFile[MAX_PATH]; // INLINED template T* TSListWinHeap::NewNode(uint32_t location, size_t extrabytes, uint32_t flags) { - T* node = new (HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(T) + extrabytes)) T; + T* node = new (HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(T) + extrabytes)) T; memset(node, 0, sizeof(T) + extrabytes); if (location) { @@ -167,7 +167,7 @@ static void AddStormFacility(uint16_t facility) { tail = &src->next; } - *tail = static_cast<_MSGSRC*>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(_MSGSRC))); + *tail = static_cast<_MSGSRC*>(HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(_MSGSRC))); (*tail)->facility = facility; (*tail)->module = StormGetInstance(); (*tail)->next = nullptr; diff --git a/Engine/Source/Storm/Source/Win64/SLock.cpp b/Engine/Source/Storm/Source/Win64/SLock.cpp index 2f63a49..2274b88 100644 --- a/Engine/Source/Storm/Source/Win64/SLock.cpp +++ b/Engine/Source/Storm/Source/Win64/SLock.cpp @@ -36,15 +36,15 @@ static CInitCritSect s_refCritsect; template CDebugLockEntry TDebugLock::s_entries[256]; -// STATIC: [0x00CB71C8, 0x00CB71F0] +// STATIC: [0x00CB71C8, 0x00CB71F0] template uint32_t TDebugLock::s_freeEntry; -// STATIC: [0x00CB71CC, 0x00CB71F4] +// STATIC: [0x00CB71CC, 0x00CB71F4] template CInitCritSect TDebugLock::s_critsect; -// STATIC: [0x00CB71EC, 0x00CB7214] +// STATIC: [0x00CB71EC, 0x00CB7214] template CDebugLock* TDebugLock::s_lockList; diff --git a/Tools/WowClient/CMakeLists.txt b/Tools/WowClient/CMakeLists.txt index 35e26fa..131001f 100644 --- a/Tools/WowClient/CMakeLists.txt +++ b/Tools/WowClient/CMakeLists.txt @@ -13,7 +13,13 @@ if (WOWCLIENT_OUTPUT_OVERRIDE) set(WOWCLIENT_OUTPUT_NAME ${WOWCLIENT_OUTPUT_OVERRIDE}) endif () -add_executable(WowClient WIN32 ${CLIENT_SOURCES} ${CLIENT_PLATFORM_SOURCES} crash_log.cpp) +option(WOWCLIENT_CRASH_LOG "Crash logger with console window and WowClient_crash.log (re/tools/build release mode turns it off)" ON) +set(CLIENT_TOOL_SOURCES "") +if (WOWCLIENT_CRASH_LOG) + list(APPEND CLIENT_TOOL_SOURCES crash_log.cpp) +endif () + +add_executable(WowClient WIN32 ${CLIENT_SOURCES} ${CLIENT_PLATFORM_SOURCES} ${CLIENT_TOOL_SOURCES}) set_target_properties(WowClient PROPERTIES OUTPUT_NAME ${WOWCLIENT_OUTPUT_NAME} diff --git a/WoW/Source/Game/DeclinedWords.cpp b/WoW/Source/Game/DeclinedWords.cpp index 62acbf2..95f5ad6 100644 --- a/WoW/Source/Game/DeclinedWords.cpp +++ b/WoW/Source/Game/DeclinedWords.cpp @@ -12,7 +12,7 @@ #include "WoW/Source/Game/ValidateName.h" // STATIC: 0x00D37DE4 -static TSHashTable s_declinedWords; +static TSHashTable s_declinedWords; // VERIFY: 6162c5b1 manual // OFFSET: 0x007E01B0 diff --git a/WoW/Source/Game/DeclinedWords.h b/WoW/Source/Game/DeclinedWords.h index c481f39..b38c0b4 100644 --- a/WoW/Source/Game/DeclinedWords.h +++ b/WoW/Source/Game/DeclinedWords.h @@ -4,7 +4,7 @@ #include #include "Engine/Source/Storm/H/stpl.h" -struct DECLINEDWORD : public TSHashObject { +struct DECLINEDWORD : public TSHashObject { /* 0018 */ int32_t m_wordId; /* 001C */ int32_t m_caseIndex; }; diff --git a/WoW/Source/Glue/CSimpleModelFFX.cpp b/WoW/Source/Glue/CSimpleModelFFX.cpp index 3ff00a3..66297bc 100644 --- a/WoW/Source/Glue/CSimpleModelFFX.cpp +++ b/WoW/Source/Glue/CSimpleModelFFX.cpp @@ -122,7 +122,9 @@ CSimpleModelFFX::~CSimpleModelFFX() { // INLINED void CSimpleModelFFX::operator delete(void* ptr) { - CSimpleModelFFX::s_simpleModelFFXHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CSimpleModelFFX::s_simpleModelFFXHeap.PutData(ptr, nullptr, 0); + } } // VERIFY: 9f5b0582 auto diff --git a/WoW/Source/Glue/CharacterSelection_Scripts.cpp b/WoW/Source/Glue/CharacterSelection_Scripts.cpp index 505be12..6668df9 100644 --- a/WoW/Source/Glue/CharacterSelection_Scripts.cpp +++ b/WoW/Source/Glue/CharacterSelection_Scripts.cpp @@ -47,7 +47,7 @@ static int32_t Script_GetNumCharacters(lua_State* L) { // VERIFY: c24567ba auto // OFFSET: 0x004E2FD0 static int32_t Script_UpdateSelectionCustomizationScene(lua_State* L) { - if (CCharacterSelection::s_selectionIndex < static_cast(CCharacterSelection::s_characterList.Count())) { + if (static_cast(CCharacterSelection::s_selectionIndex) < CCharacterSelection::s_characterList.Count()) { CCharacterComponent* component = CCharacterSelection::s_characterList[CCharacterSelection::s_selectionIndex].m_component; if (component) { diff --git a/WoW/Source/Object/MovementShared.cpp b/WoW/Source/Object/MovementShared.cpp index 446af73..0016494 100644 --- a/WoW/Source/Object/MovementShared.cpp +++ b/WoW/Source/Object/MovementShared.cpp @@ -60,7 +60,7 @@ float CMovementShared::TimeToFallDistance(float distance, int32_t safeFall) { if (distance < accelDistance) { if (0.0f < distance) { - return sqrt(distance * 0.10367472f); + return sqrt(distance * 0.103674725f); } return 0.0f; diff --git a/WoW/Source/Object/ObjectClient/DynamicObject_C.cpp b/WoW/Source/Object/ObjectClient/DynamicObject_C.cpp index 174cc54..6b54bcf 100644 --- a/WoW/Source/Object/ObjectClient/DynamicObject_C.cpp +++ b/WoW/Source/Object/ObjectClient/DynamicObject_C.cpp @@ -99,6 +99,11 @@ void CGDynamicObject_C::PostInit(uint32_t time, const CClientObjCreate& create, } } +// OFFSET: 0x00706560 +uint64_t CGDynamicObject_C::GetTransportGUID() const { + return this->m_passenger.m_transportGuid.m_guid; +} + // VERIFY: fe375946 manual // OFFSET: 0x00704CC0 C44Matrix CGDynamicObject_C::GetMatrix() const { diff --git a/WoW/Source/Object/ObjectClient/DynamicObject_C.h b/WoW/Source/Object/ObjectClient/DynamicObject_C.h index 3a88847..fc5a652 100644 --- a/WoW/Source/Object/ObjectClient/DynamicObject_C.h +++ b/WoW/Source/Object/ObjectClient/DynamicObject_C.h @@ -33,6 +33,7 @@ class CGDynamicObject_C : public CGObject_C, public CGDynamicObject { virtual float GetFacing() const; float GetRawFacing() const override; float GetScale() const override; + uint64_t GetTransportGUID() const override; virtual C44Matrix GetMatrix() const; virtual void ShouldRender(uint32_t flags, int32_t& render, int32_t& a3); void SetFrameOfReference(const C44Matrix* matrix) override; diff --git a/WoW/Source/Object/ObjectClient/Item_C.cpp b/WoW/Source/Object/ObjectClient/Item_C.cpp index 19c1060..057596e 100644 --- a/WoW/Source/Object/ObjectClient/Item_C.cpp +++ b/WoW/Source/Object/ObjectClient/Item_C.cpp @@ -342,6 +342,11 @@ void CGItem_C::RequestItemCacheInfo() { } } +// OFFSET: 0x0070AFB0 +void CGItem_C::PostReenable() { + this->RequestItemCacheInfo(); +} + // VERIFY: fffdf723 auto // OFFSET: 0x0070AF80 void CGItem_C::PostInit(uint32_t time, const CClientObjCreate& create, bool a3) { diff --git a/WoW/Source/Object/ObjectClient/Item_C.h b/WoW/Source/Object/ObjectClient/Item_C.h index ee53c18..61a6f68 100644 --- a/WoW/Source/Object/ObjectClient/Item_C.h +++ b/WoW/Source/Object/ObjectClient/Item_C.h @@ -58,6 +58,7 @@ class CGItem_C : public CGObject_C, public CGItem { /* 03DC */ uint8_t unk_03DC [4]; ~CGItem_C() override; + void PostReenable() override; int32_t GetSelectionHighlightColor(CImVector* color) const override; void OnRightClick() override; const char* GetObjectName() const override; diff --git a/WoW/Source/Object/ObjectClient/Player_C.cpp b/WoW/Source/Object/ObjectClient/Player_C.cpp index 69e2c5a..32370f7 100644 --- a/WoW/Source/Object/ObjectClient/Player_C.cpp +++ b/WoW/Source/Object/ObjectClient/Player_C.cpp @@ -6911,7 +6911,7 @@ int32_t CGPlayer_C::CanUseItem(const ItemStats_C* stats, int32_t& error) { return 0; } - if (stats->m_requiredCityRank && !this->HasPvpMedal(static_cast(stats->m_requiredCityRank))) { + if (stats->m_requiredCityRank && !this->HasPvpMedal(stats->m_requiredCityRank)) { error = ERR_CANT_USE_ITEM; return 0; } diff --git a/WoW/Source/Object/ObjectClient/Unit_C.cpp b/WoW/Source/Object/ObjectClient/Unit_C.cpp index 37d4f40..c465f80 100644 --- a/WoW/Source/Object/ObjectClient/Unit_C.cpp +++ b/WoW/Source/Object/ObjectClient/Unit_C.cpp @@ -18001,7 +18001,7 @@ void CGUnit_C::HandleSpellEventSound() { SpellRec spell; if (!g_spellDB.GetRecord(this->m_castSpellId, &spell)) { - SysMsgPrintf(STATUS_ERROR, 2, "NOSPELLIDFOUND|%d", this->m_castSpellId); + SysMsgPrintf(STATUS_WARNING, 2, "NOSPELLIDFOUND|%d", this->m_castSpellId); return; } @@ -18009,7 +18009,7 @@ void CGUnit_C::HandleSpellEventSound() { const SpellVisualRec* visual = this->GetAppropriateSpellVisual(&spell, visualRec, 0, 0); if (!visual) { - SysMsgPrintf(STATUS_ERROR, 2, "SPELLVISUALIDNOTFOUND|%d", spell.m_spellVisualID[0]); + SysMsgPrintf(STATUS_WARNING, 2, "SPELLVISUALIDNOTFOUND|%d", spell.m_spellVisualID[0]); return; } diff --git a/WoW/Source/Object/Player.cpp b/WoW/Source/Object/Player.cpp index e17636b..a302dc7 100644 --- a/WoW/Source/Object/Player.cpp +++ b/WoW/Source/Object/Player.cpp @@ -157,7 +157,7 @@ uint32_t CGPlayer::GetBuybackPrice(uint32_t slot) { // VERIFY: feec4401 manual // OFFSET: 0x0061DCB0 -bool CGPlayer::HasPvpMedal(uint8_t medal) { +bool CGPlayer::HasPvpMedal(uint32_t medal) { return (this->m_player->m_playerFieldPvpMedals & (1 << (medal - 1))) != 0; } diff --git a/WoW/Source/Object/Player.h b/WoW/Source/Object/Player.h index 1347a68..dff9daf 100644 --- a/WoW/Source/Object/Player.h +++ b/WoW/Source/Object/Player.h @@ -28,7 +28,7 @@ class CGPlayer { public: PlayerQuestLogEntry* GetQuestLogEntry(uint32_t slot); uint32_t GetBuybackPrice(uint32_t slot); - bool HasPvpMedal(uint8_t medal); + bool HasPvpMedal(uint32_t medal); bool HasAuraVision(uint8_t vision); static const uint32_t s_mirrorFields[173]; static const uint32_t s_localMirrorFields[870]; diff --git a/WoW/Source/SoundInterface/SoundInterface2Glue.cpp b/WoW/Source/SoundInterface/SoundInterface2Glue.cpp index c38a2d8..b1cd4a9 100644 --- a/WoW/Source/SoundInterface/SoundInterface2Glue.cpp +++ b/WoW/Source/SoundInterface/SoundInterface2Glue.cpp @@ -162,6 +162,7 @@ void SI2::StartCreditsMusic(const char* name) { SE2SoundKitProperties properties; properties.ResetToDefaults(); + properties.m_group = 1; properties.m_selectMode = 0; SI2::PlaySoundKit(s_creditsMusicName, nullptr, &s_creditsMusic, &properties); diff --git a/WoW/Source/UIUtil/Camera_CVar.cpp b/WoW/Source/UIUtil/Camera_CVar.cpp index 90b436e..97e9c04 100644 --- a/WoW/Source/UIUtil/Camera_CVar.cpp +++ b/WoW/Source/UIUtil/Camera_CVar.cpp @@ -400,7 +400,7 @@ static bool ValidateCameraYaw(CVar* var, const char* oldValue, const char* value return true; } - ConsoleWriteA("Value out of range (%f - %f)\n", DEFAULT_COLOR, 0.0, 360.0); + ConsoleWriteA("Value out of range (%f - %f)\n", DEFAULT_COLOR, 0.0, 360.00001422012247); return false; } @@ -413,7 +413,7 @@ static bool ValidateCameraAngularSpeed(CVar* var, const char* oldValue, const ch return true; } - ConsoleWriteA("Value out of range (%f - %f)\n", DEFAULT_COLOR, 0.1f, 360.0f); + ConsoleWriteA("Value out of range (%f - %f)\n", DEFAULT_COLOR, 0.10000000039264378, 360.00001422012247); return false; } diff --git a/WoW/Source/UIUtil/Tooltip.cpp b/WoW/Source/UIUtil/Tooltip.cpp index 55604b8..9e0f927 100644 --- a/WoW/Source/UIUtil/Tooltip.cpp +++ b/WoW/Source/UIUtil/Tooltip.cpp @@ -563,7 +563,9 @@ const char* CGTooltip::GetAchievementHyperlink(int32_t achievementId, WOWGUID gu // INLINED void CGTooltip::operator delete(void* ptr) { - CGTooltip::s_tooltipHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGTooltip::s_tooltipHeap.PutData(ptr, nullptr, 0); + } } // VERIFY: 7ff12d51 auto @@ -3531,8 +3533,8 @@ int32_t GetFeralAttackPower(const ItemStats_C* stats, float damage) { if (stats->m_class == 2 && (s_inventoryTypeSlots[stats->m_inventoryType] & 0x8000)) { double dps = damage / (stats->m_delay * 0.001f); - if (dps > 54.810001) { - return static_cast(floor((dps - 54.810001) * 14.0 + 0.5)); + if (dps > 54.81f) { + return static_cast(floor((dps - 54.81f) * 14.0f + 0.5f)); } } diff --git a/WoW/Source/Ui/CGCooldown.cpp b/WoW/Source/Ui/CGCooldown.cpp index b34211f..e7b05ae 100644 --- a/WoW/Source/Ui/CGCooldown.cpp +++ b/WoW/Source/Ui/CGCooldown.cpp @@ -56,7 +56,9 @@ CDataAllocator CGCooldown::s_cooldownHeap(sizeof(CGCooldown), 100); // INLINED void CGCooldown::operator delete(void* ptr) { - CGCooldown::s_cooldownHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGCooldown::s_cooldownHeap.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/WoW/Source/Ui/CGQuestPOIFrame.cpp b/WoW/Source/Ui/CGQuestPOIFrame.cpp index bbf6e81..58b0f39 100644 --- a/WoW/Source/Ui/CGQuestPOIFrame.cpp +++ b/WoW/Source/Ui/CGQuestPOIFrame.cpp @@ -40,7 +40,9 @@ CDataAllocator CGQuestPOIFrame::s_questPOIHeap(sizeof(CGQuestPOIFrame), 5); // INLINED void CGQuestPOIFrame::operator delete(void* ptr) { - CGQuestPOIFrame::s_questPOIHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGQuestPOIFrame::s_questPOIHeap.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/WoW/Source/Ui/CharacterModelBase.cpp b/WoW/Source/Ui/CharacterModelBase.cpp index a39f669..94f8d5b 100644 --- a/WoW/Source/Ui/CharacterModelBase.cpp +++ b/WoW/Source/Ui/CharacterModelBase.cpp @@ -55,7 +55,9 @@ static int32_t IsUnitDrawable(CGUnit_C* unit) { // INLINED void CGCharacterModelBase::operator delete(void* ptr) { - CGCharacterModelBase::s_characterModelHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGCharacterModelBase::s_characterModelHeap.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/WoW/Source/Ui/ChatBubbleFrame.cpp b/WoW/Source/Ui/ChatBubbleFrame.cpp index 7f30d1c..c1936de 100644 --- a/WoW/Source/Ui/ChatBubbleFrame.cpp +++ b/WoW/Source/Ui/ChatBubbleFrame.cpp @@ -41,7 +41,9 @@ CDataAllocator CGChatBubbleFrame::s_chatBubbleHeap(sizeof(CGChatBubbleFrame), 10 // INLINED void CGChatBubbleFrame::operator delete(void* ptr) { - CGChatBubbleFrame::s_chatBubbleHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGChatBubbleFrame::s_chatBubbleHeap.PutData(ptr, nullptr, 0); + } } // VERIFY: 20523c8e auto diff --git a/WoW/Source/Ui/ClassTrainerFrame_Scripts.cpp b/WoW/Source/Ui/ClassTrainerFrame_Scripts.cpp index b7ac967..276c07c 100644 --- a/WoW/Source/Ui/ClassTrainerFrame_Scripts.cpp +++ b/WoW/Source/Ui/ClassTrainerFrame_Scripts.cpp @@ -737,12 +737,12 @@ static int32_t Script_SetTrainerServiceTypeFilter(lua_State* L) { int32_t filter = g_serviceTypeFilterCVar->m_intValue; - if (!lua_tonumber(L, 2)) { + if (!static_cast(lua_tonumber(L, 2))) { CGClassTrainer::SetServiceTypeFilter(filter & ~(1 << serviceType)); return 0; } - if (lua_isnumber(L, 3) && lua_tonumber(L, 3)) { + if (lua_isnumber(L, 3) && static_cast(lua_tonumber(L, 3))) { CGClassTrainer::SetServiceTypeFilter(1 << serviceType); return 0; } @@ -780,12 +780,12 @@ static int32_t Script_SetTrainerSkillLineFilter(lua_State* L) { uint32_t filter = CGClassTrainer::m_skillLineFilter; - if (!lua_tonumber(L, 2)) { + if (!static_cast(lua_tonumber(L, 2))) { CGClassTrainer::SetSkillLineFilter(filter & ~(1 << index)); return 0; } - if (lua_isnumber(L, 3) && lua_tonumber(L, 3)) { + if (lua_isnumber(L, 3) && static_cast(lua_tonumber(L, 3))) { CGClassTrainer::SetSkillLineFilter(1 << index); return 0; } diff --git a/WoW/Source/Ui/CurrencyTypes.cpp b/WoW/Source/Ui/CurrencyTypes.cpp index 2a51979..d35020b 100644 --- a/WoW/Source/Ui/CurrencyTypes.cpp +++ b/WoW/Source/Ui/CurrencyTypes.cpp @@ -64,7 +64,7 @@ void CGCurrencyTypes::SetCategoryExpand(int32_t index, int32_t expand) { } for (int32_t i = 0; i < CGCurrencyTypes::m_numCategories; i++) { - if (CGCurrencyTypes::m_categories[i].m_id == CGCurrencyTypes::m_list[index].m_itemID) { + if (CGCurrencyTypes::m_categories[i].m_id == CGCurrencyTypes::m_list[index].m_categoryID) { CGCurrencyTypes::m_categories[i].m_expanded = expand; return; } diff --git a/WoW/Source/Ui/DanceStudio.cpp b/WoW/Source/Ui/DanceStudio.cpp index ddcf982..14cb939 100644 --- a/WoW/Source/Ui/DanceStudio.cpp +++ b/WoW/Source/Ui/DanceStudio.cpp @@ -18,7 +18,7 @@ uint64_t CGDanceStudio::m_learnedDanceMoves; // STATIC: 0x00BEB638 -static TSHashTable s_knownDances; +static TSHashTable s_knownDances; // VERIFY: 5e35e0a7 manual // OFFSET: 0x00576730 diff --git a/WoW/Source/Ui/DanceStudio.h b/WoW/Source/Ui/DanceStudio.h index b50a6b7..ac59499 100644 --- a/WoW/Source/Ui/DanceStudio.h +++ b/WoW/Source/Ui/DanceStudio.h @@ -12,7 +12,7 @@ class CDataStore; class DanceCache; struct lua_State; -struct KNOWNDANCES : public TSHashObject { +struct KNOWNDANCES : public TSHashObject { /* 0018 */ uint32_t m_id; /* 001C */ uint32_t unk_001C; }; diff --git a/WoW/Source/Ui/DressUpModelFrame.cpp b/WoW/Source/Ui/DressUpModelFrame.cpp index 72f206d..cea8944 100644 --- a/WoW/Source/Ui/DressUpModelFrame.cpp +++ b/WoW/Source/Ui/DressUpModelFrame.cpp @@ -40,7 +40,9 @@ CDataAllocator CGDressUpModelFrame::s_dressUpModelHeap(sizeof(CGDressUpModelFram // INLINED void CGDressUpModelFrame::operator delete(void* ptr) { - CGDressUpModelFrame::s_dressUpModelHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGDressUpModelFrame::s_dressUpModelHeap.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/WoW/Source/Ui/GameUI_CVar.cpp b/WoW/Source/Ui/GameUI_CVar.cpp index f22f347..2b34076 100644 --- a/WoW/Source/Ui/GameUI_CVar.cpp +++ b/WoW/Source/Ui/GameUI_CVar.cpp @@ -423,7 +423,7 @@ bool CVarHandler_useUiScale(CVar* var, const char* oldValue, const char* value, CGGameUI::SetUIScale(scale); } else { CRect rect = { 0.0f, 0.0f, 0.0f, 0.0f }; - g_theGxDevicePtr->CapsWindowSize(rect); + g_theGxDevicePtr->CapsWindowSizeInScreenCoords(rect); CGGameUI::ScaleToScreenSize(static_cast(rect.maxX - rect.minX), static_cast(rect.maxY - rect.minY), 1); } diff --git a/WoW/Source/Ui/HealthBar.cpp b/WoW/Source/Ui/HealthBar.cpp index a9e9385..24c65dc 100644 --- a/WoW/Source/Ui/HealthBar.cpp +++ b/WoW/Source/Ui/HealthBar.cpp @@ -10,7 +10,9 @@ CDataAllocator CGSimpleHealthBar::s_simpleHealthBarHeap(sizeof(CGSimpleHealthBar // INLINED void CGSimpleHealthBar::operator delete(void* ptr) { - CGSimpleHealthBar::s_simpleHealthBarHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGSimpleHealthBar::s_simpleHealthBarHeap.PutData(ptr, nullptr, 0); + } } // VERIFY: 56bf9a4e manual diff --git a/WoW/Source/Ui/LFGInfo_Scripts.cpp b/WoW/Source/Ui/LFGInfo_Scripts.cpp index 9bad9a3..ad78aae 100644 --- a/WoW/Source/Ui/LFGInfo_Scripts.cpp +++ b/WoW/Source/Ui/LFGInfo_Scripts.cpp @@ -600,6 +600,9 @@ static int32_t Script_GetLFDLockPlayerCount(lua_State* L) { // VERIFY: 51dce08f auto // OFFSET: 0x00557BE0 static int32_t Script_GetLFGDungeonRewardInfo(lua_State* L) { + // STATIC: 0x00BEABC8 + static char texture[260]; + if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) { luaL_error(L, "Usage: GetLFGDungeonRewardInfo(dungeonID, lootIndex)"); return 0; @@ -628,9 +631,9 @@ static int32_t Script_GetLFGDungeonRewardInfo(lua_State* L) { } const char* path = ClientDBStringLookup(3); - SStrPrintf(s_rewardItemTexture, sizeof(s_rewardItemTexture), "%s%s%s", path, *path ? "\\" : "", CGItem_C::GetInventoryArt(item->m_displayID)); + SStrPrintf(texture, sizeof(texture), "%s%s%s", path, *path ? "\\" : "", CGItem_C::GetInventoryArt(item->m_displayID)); lua_pushstring(L, name); - lua_pushstring(L, s_rewardItemTexture); + lua_pushstring(L, texture); lua_pushnumber(L, item->m_quantity); return 3; } diff --git a/WoW/Source/Ui/MailInfo_Scripts.cpp b/WoW/Source/Ui/MailInfo_Scripts.cpp index a1aa4e9..1be0ed0 100644 --- a/WoW/Source/Ui/MailInfo_Scripts.cpp +++ b/WoW/Source/Ui/MailInfo_Scripts.cpp @@ -211,7 +211,7 @@ static int32_t Script_SelectStationery(lua_State* L) { uint32_t index = static_cast(lua_tonumber(L, 1)) - 1; - if (index >= CGMailInfo::m_stationeries.Count()) { + if (index >= CGMailInfo::m_numStationeries) { CGMailInfo::m_selectedStationery = 0; } else { CGMailInfo::m_selectedStationery = CGMailInfo::m_stationeries.m_data[index]->m_id; diff --git a/WoW/Source/Ui/MinimapFrame.cpp b/WoW/Source/Ui/MinimapFrame.cpp index e5dde40..01d72d0 100644 --- a/WoW/Source/Ui/MinimapFrame.cpp +++ b/WoW/Source/Ui/MinimapFrame.cpp @@ -386,7 +386,9 @@ static const int32_t s_tileOffsets[4][2] = { { 0, 0 }, { 1, 0 }, { 1, 1 }, { 0, // INLINED void CGMinimapFrame::operator delete(void* ptr) { - CGMinimapFrame::s_minimapHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGMinimapFrame::s_minimapHeap.PutData(ptr, nullptr, 0); + } } // INLINED @@ -1122,7 +1124,7 @@ void MINIMAPTILE::Render(uint32_t index, const CImVector* color) { GxPrimLockVertexPtrs(4, this->m_vertices, sizeof(C3Vector), &normal, 0, color, 0, nullptr, 0, this->m_texCoords, sizeof(C2Vector), this->m_maskCoords, sizeof(C2Vector)); GxDrawLockedElements(GxPrim_TriangleStrip, 4, s_quadIndices); GxPrimUnlockVertexPtrs(); - GxRsSet(GxRs_Texture1, static_cast(nullptr)); + GxRsSet(GxRs_Texture1, 0); } // VERIFY: e8182a5d manual @@ -3622,6 +3624,12 @@ void CGMinimapFrame::ShutdownGame() { s_poiArrowTexture = nullptr; + if (s_corpseArrowTexture) { + HandleClose(reinterpret_cast(s_corpseArrowTexture)); + } + + s_corpseArrowTexture = nullptr; + if (s_groupArrowTexture) { HandleClose(reinterpret_cast(s_groupArrowTexture)); } diff --git a/WoW/Source/Ui/NamePlateFrame.cpp b/WoW/Source/Ui/NamePlateFrame.cpp index 013f269..cc7e3e9 100644 --- a/WoW/Source/Ui/NamePlateFrame.cpp +++ b/WoW/Source/Ui/NamePlateFrame.cpp @@ -66,7 +66,9 @@ CDataAllocator CGNamePlateFrame::s_namePlateHeap(sizeof(CGNamePlateFrame), 5); // INLINED void CGNamePlateFrame::operator delete(void* ptr) { - CGNamePlateFrame::s_namePlateHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGNamePlateFrame::s_namePlateHeap.PutData(ptr, nullptr, 0); + } } // VERIFY: eb556f09 auto diff --git a/WoW/Source/Ui/ScriptEvents_Scripts.cpp b/WoW/Source/Ui/ScriptEvents_Scripts.cpp index e1769ae..e81857d 100644 --- a/WoW/Source/Ui/ScriptEvents_Scripts.cpp +++ b/WoW/Source/Ui/ScriptEvents_Scripts.cpp @@ -4398,7 +4398,7 @@ static int32_t Script_GetUnitManaRegenRateFromSpirit(lua_State* L) { CGUnit_C* unit = GetUnitFromName(lua_tolstring(L, 1, nullptr)); if (unit && (unit->IsActivePlayer() || unit->m_unit->m_unitFieldPetnumber)) { - lua_pushnumber(L, unit->GetManaRegenRateFromSpirit() + 0.001); + lua_pushnumber(L, unit->GetManaRegenRateFromSpirit() + 0.001f); } else { lua_pushnumber(L, 0.0); } diff --git a/WoW/Source/Ui/SpellBookFrame.cpp b/WoW/Source/Ui/SpellBookFrame.cpp index 83641aa..f20254d 100644 --- a/WoW/Source/Ui/SpellBookFrame.cpp +++ b/WoW/Source/Ui/SpellBookFrame.cpp @@ -1332,7 +1332,7 @@ int32_t CGSpellBook::FindCompanionSlotByID(int32_t spellId, int32_t type) { // VERIFY: 67b33918 auto // OFFSET: 0x0053B900 bool HasPetSpell(int32_t spellId) { - if (spellId > g_spellDB.m_maxID) { + if (static_cast(spellId) > static_cast(g_spellDB.m_maxID)) { return false; } diff --git a/WoW/Source/Ui/TabardModelFrame.cpp b/WoW/Source/Ui/TabardModelFrame.cpp index 696830b..98815de 100644 --- a/WoW/Source/Ui/TabardModelFrame.cpp +++ b/WoW/Source/Ui/TabardModelFrame.cpp @@ -33,7 +33,9 @@ CDataAllocator CGTabardModelFrame::s_tabardModelHeap(sizeof(CGTabardModelFrame), // INLINED void CGTabardModelFrame::operator delete(void* ptr) { - CGTabardModelFrame::s_tabardModelHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGTabardModelFrame::s_tabardModelHeap.PutData(ptr, nullptr, 0); + } } // INLINED diff --git a/WoW/Source/Ui/TalentInfo_Scripts.cpp b/WoW/Source/Ui/TalentInfo_Scripts.cpp index e2f0ac2..6106a49 100644 --- a/WoW/Source/Ui/TalentInfo_Scripts.cpp +++ b/WoW/Source/Ui/TalentInfo_Scripts.cpp @@ -57,7 +57,7 @@ static int32_t Script_GetNumTalents(lua_State* L) { int32_t inspect = StringToBOOL(L, 2, 0); int32_t pet = StringToBOOL(L, 3, 0); TalentTabInfo* tab = CGTalentInfo::GetTab(tabIndex, inspect, pet); - lua_pushnumber(L, tab ? static_cast(tab->m_numTalents) : 0); + lua_pushnumber(L, tab ? tab->m_numTalents : 0); return 1; } diff --git a/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp b/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp index 4d5e8be..7ad7c2f 100644 --- a/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp +++ b/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp @@ -814,9 +814,9 @@ static int32_t Script_SetTradeSkillSubClassFilter(lua_State* L) { uint32_t filter = CGTradeSkillInfo::m_subClassFilter; - if (!lua_tonumber(L, 2)) { + if (!static_cast(lua_tonumber(L, 2))) { CGTradeSkillInfo::SetSubClassFilter(filter & ~(1 << index), index); - } else if (lua_isnumber(L, 3) && lua_tonumber(L, 3)) { + } else if (lua_isnumber(L, 3) && static_cast(lua_tonumber(L, 3))) { CGTradeSkillInfo::SetSubClassFilter(1 << index, index); } else { CGTradeSkillInfo::SetSubClassFilter(filter | (1 << index), index); diff --git a/WoW/Source/Ui/WorldFrame.cpp b/WoW/Source/Ui/WorldFrame.cpp index 8df06b9..6957907 100644 --- a/WoW/Source/Ui/WorldFrame.cpp +++ b/WoW/Source/Ui/WorldFrame.cpp @@ -1271,7 +1271,9 @@ CSimpleFrame* CGWorldFrame::Create(CSimpleFrame* parent) { // INLINED void CGWorldFrame::operator delete(void* ptr) { - CGWorldFrame::s_worldFrameHeap.PutData(ptr, nullptr, 0); + if (ptr) { + CGWorldFrame::s_worldFrameHeap.PutData(ptr, nullptr, 0); + } } // VERIFY: ee139ec8 auto diff --git a/WoW/Source/WorldClient/Map.cpp b/WoW/Source/WorldClient/Map.cpp index af58ed6..a2b8f1a 100644 --- a/WoW/Source/WorldClient/Map.cpp +++ b/WoW/Source/WorldClient/Map.cpp @@ -2448,10 +2448,11 @@ int32_t CMap::SafeOpen(const char* fileName, SFileImpl** file) { int32_t tries = 10; while (!SFileOpenFile(fileName, file)) { - DebugLog("CMap::SafeOpen() failed %s\n"); + DebugLog("CMap::SafeOpen() failed %s\n", fileName); if (!--tries) { SErrDisplayAppFatal("CMap::SafeOpen() failed %s", fileName); + return 0; } } @@ -2464,10 +2465,10 @@ int32_t CMap::SafeRead(const char* fileName, SFileImpl* file, void* buffer, uint int32_t tries = 10; while (!SFileReadFile(file, buffer, size, nullptr, nullptr, 0)) { - DebugLog("CMap::SafeRead() failed %s\n"); + DebugLog("CMap::SafeRead() failed %s\n", fileName); if (!--tries) { - DebugLog("CMap::SafeRead() failed %s"); + DebugLog("CMap::SafeRead() failed %s", fileName); return 0; } } @@ -2526,7 +2527,7 @@ void CMap::ValidateShaders() { // OFFSET: 0x007BD9F0 void CMap::Preload() { CMap::PurgeMaps(); - CMapObj::ClearCache(1); + CMapObj::ClearCache(0); CMap::ClearAllFootprints(); TextureGxCacheFlush(); CMap::bPreload = 1; @@ -4145,7 +4146,7 @@ CTexture* CMap::LoadTexture(const char* fileName) { SysMsgAdd(&status); if (!texture) { - DebugLog("Failed to load texture: %s\n"); + DebugLog("Failed to load texture: %s\n", fileName); } return texture; diff --git a/WoW/Source/WorldClient/MapObjDef.cpp b/WoW/Source/WorldClient/MapObjDef.cpp index 24f0843..e47814f 100644 --- a/WoW/Source/WorldClient/MapObjDef.cpp +++ b/WoW/Source/WorldClient/MapObjDef.cpp @@ -181,7 +181,7 @@ bool CMapObjDefGroup::IsAllLoaded() { for (CMapBaseObjLink* link = this->m_doodadDefLinkList.Head(); link; link = this->m_doodadDefLinkList.Next(link)) { CMapStaticEntity* doodadDef = static_cast(link->m_owner); - if (doodadDef->m_model && !(static_cast(doodadDef->m_flags) & 0x80000000)) { + if (doodadDef->m_model && !(doodadDef->m_flags & 0x80)) { if (SFile::IsStreamingMode()) { doodadDef->m_model->LinkToAsyncHead(1); } diff --git a/WoW/Source/WorldClient/ShadowQuery.cpp b/WoW/Source/WorldClient/ShadowQuery.cpp index 63ff6ed..2065c9b 100644 --- a/WoW/Source/WorldClient/ShadowQuery.cpp +++ b/WoW/Source/WorldClient/ShadowQuery.cpp @@ -61,7 +61,7 @@ void CShadowQuery::Initialize() { g_shadowScissor = CVar::Register("shadowScissor", "enable scissoring when rendering shadowmaps", 0, "1", nullptr, CATEGORY_DEFAULT, false, nullptr, false); g_shadowInstancing = CVar::Register("shadowInstancing", "enable instancing when rendering shadowmaps", 0, "1", nullptr, CATEGORY_DEFAULT, false, nullptr, false); - CShadowCache::Init(); + CShadowCache::Initialize(); } // OFFSET: 0x007BA7D0 diff --git a/WoW/Source/WowSvcs/WowSvcsClient/FriendList.h b/WoW/Source/WowSvcs/WowSvcsClient/FriendList.h index 4555210..3f4e560 100644 --- a/WoW/Source/WowSvcs/WowSvcsClient/FriendList.h +++ b/WoW/Source/WowSvcs/WowSvcsClient/FriendList.h @@ -77,7 +77,7 @@ class FriendList { /* DC8C */ int32_t m_whoClassMask; /* DC90 */ int32_t m_whoStringCount; /* DC94 */ char m_whoStrings[10][128]; - /* E094 */ uint8_t unk_E094[260]; + /* E194 */ uint8_t unk_E194[4]; FriendList(); ~FriendList();