diff --git a/Source/Client/Session/Session.cpp b/Source/Client/Session/Session.cpp index c0ba79ae2..c5874a259 100644 --- a/Source/Client/Session/Session.cpp +++ b/Source/Client/Session/Session.cpp @@ -1727,30 +1727,30 @@ bool CSession::RemoveFriendByCharacterId(std::uint32_t characterId) { // OFFSET: 0x00DF9F10 // FUNCTION: fn_23568 -bool CSession::IsGuildMemberAccount(std::uint32_t accountId) const { +int CSession::IsGuildMemberAccount(std::uint32_t accountId) const { std::list members; members = g_guildInfo.m_members; for (const GuildInfo::Member& member : members) { if (static_cast(member.accountId) == accountId) { - return true; + return 1; } } - return false; + return 0; } // OFFSET: 0x00DFA030 // FUNCTION: fn_23569 -bool CSession::IsGuildMemberCharacter(std::uint32_t characterId) const { +int CSession::IsGuildMemberCharacter(std::uint32_t characterId) const { std::list members; members = g_guildInfo.m_members; for (const GuildInfo::Member& member : members) { if (static_cast(member.characterId) == characterId) { - return true; + return 1; } } - return false; + return 0; } // OFFSET: 0x00DFA150 diff --git a/Source/Client/Session/Session.h b/Source/Client/Session/Session.h index d4e9aab78..a94b2d341 100644 --- a/Source/Client/Session/Session.h +++ b/Source/Client/Session/Session.h @@ -846,8 +846,8 @@ public: int IsFriendName(const char* name) const; bool RemoveFriendByCharacterId(std::uint32_t characterId); void RemovePartyMemberByName(const char* name); - bool IsGuildMemberAccount(std::uint32_t accountId) const; - bool IsGuildMemberCharacter(std::uint32_t characterId) const; + int IsGuildMemberAccount(std::uint32_t accountId) const; + int IsGuildMemberCharacter(std::uint32_t characterId) const; bool IsGuildMemberCharacter(int characterId, char* name) const; bool IsGuildMemberName(const char* name) const; bool IsIndoorMapName(const char* name) const; diff --git a/Source/Contents/Effects/EffectResourceSwitcher.cpp b/Source/Contents/Effects/EffectResourceSwitcher.cpp index 021465724..75039b026 100644 --- a/Source/Contents/Effects/EffectResourceSwitcher.cpp +++ b/Source/Contents/Effects/EffectResourceSwitcher.cpp @@ -266,7 +266,7 @@ CEZ2STREffectMgr* Singleton::GetInstance() { // OFFSET: 0x006FFA00 // FUNCTION: fn_06967 -__declspec(noinline) bool CEZ2STREffectEx::IsFinished() { +__declspec(noinline) unsigned char CEZ2STREffectEx::IsFinished() { if (!this->emitter) { return false; } diff --git a/Source/Contents/Effects/Particles/EZ2STREffectEx.h b/Source/Contents/Effects/Particles/EZ2STREffectEx.h index e868b4515..58ab0d2cf 100644 --- a/Source/Contents/Effects/Particles/EZ2STREffectEx.h +++ b/Source/Contents/Effects/Particles/EZ2STREffectEx.h @@ -27,7 +27,7 @@ public: void EnableTimeLimit() override; void EnableGroundRender() override; - bool IsFinished(); + unsigned char IsFinished(); void EndLoop(unsigned char fadeOut); /* 00CC */ EZ2STREmitter* emitter; diff --git a/Source/Render/DX7/BackBufferDX7.cpp b/Source/Render/DX7/BackBufferDX7.cpp index 453633bd6..7d6aacae5 100644 --- a/Source/Render/DX7/BackBufferDX7.cpp +++ b/Source/Render/DX7/BackBufferDX7.cpp @@ -43,19 +43,19 @@ bool CRendererDX7::RestoreBackBuffer() { // OFFSET: 0x0055D3E0 // FUNCTION: fn_02103 -bool CRendererDX7::LockBackBuffer() { +int CRendererDX7::LockBackBuffer() { DDSURFACEDESC2 description = {sizeof(description)}; IDirectDrawSurface7* renderTarget = g_deviceOwnerDX7 ? g_deviceOwnerDX7->renderTarget : nullptr; if (FAILED(renderTarget->Lock(nullptr, &description, DDLOCK_WAIT, nullptr))) { - return false; + return 0; } this->backBuffer.pixels = description.lpSurface; this->backBuffer.bitsPerPixel = description.ddpfPixelFormat.dwRGBBitCount; this->backBuffer.pitch = description.lPitch; - return true; + return 1; } // OFFSET: 0x0055FBB0 diff --git a/Source/Render/DX7/RendererDX7.h b/Source/Render/DX7/RendererDX7.h index 52c3f7051..d3003e428 100644 --- a/Source/Render/DX7/RendererDX7.h +++ b/Source/Render/DX7/RendererDX7.h @@ -29,7 +29,7 @@ public: void SetClearColor(unsigned color) override; void SetFog(int enabled) override; bool Draw() override; - bool LockBackBuffer() override; + int LockBackBuffer() override; HRESULT UnlockBackBuffer() override; void SetTextureFormat(unsigned format); diff --git a/Source/Render/DX9/RendererBackBuffer.cpp b/Source/Render/DX9/RendererBackBuffer.cpp index 897c55593..7e79b78d5 100644 --- a/Source/Render/DX9/RendererBackBuffer.cpp +++ b/Source/Render/DX9/RendererBackBuffer.cpp @@ -3,12 +3,12 @@ // OFFSET: 0x00567E80 // FUNCTION: fn_02232 -bool CRendererDX9::LockBackBuffer() { +int CRendererDX9::LockBackBuffer() { const DeviceOwnerDX9& owner = *this->device; D3DLOCKED_RECT locked; if (FAILED(owner.backBuffer->LockRect(&locked, nullptr, 0))) { - return false; + return 0; } this->backBuffer.pixels = locked.pBits; @@ -32,7 +32,7 @@ bool CRendererDX9::LockBackBuffer() { } this->backBuffer.bitsPerPixel = bitsPerPixel; - return true; + return 1; } // OFFSET: 0x00568ED0 diff --git a/Source/Render/DX9/RendererDX9.h b/Source/Render/DX9/RendererDX9.h index 710e4a862..dc9932301 100644 --- a/Source/Render/DX9/RendererDX9.h +++ b/Source/Render/DX9/RendererDX9.h @@ -31,7 +31,7 @@ public: bool SaveJpeg(const char* filename, CBitmapRes* overlay) override; void CleanupTextures() override; bool SaveLogo(std::string filename) override; - bool LockBackBuffer() override; + int LockBackBuffer() override; HRESULT UnlockBackBuffer() override; void SetTextureMode(int mode); diff --git a/Source/Render/Renderer.h b/Source/Render/Renderer.h index ffdf9a6d6..fa87af12a 100644 --- a/Source/Render/Renderer.h +++ b/Source/Render/Renderer.h @@ -39,7 +39,7 @@ public: virtual bool SaveJpeg(const char* filename, CBitmapRes* overlay) = 0; virtual void CleanupTextures() = 0; virtual bool SaveLogo(std::string filename) = 0; - virtual bool LockBackBuffer() = 0; + virtual int LockBackBuffer() = 0; virtual HRESULT UnlockBackBuffer() = 0; float* ProjectViewport(const float* position, const float* matrix, float* x, float* y, float* reciprocalDepth); float* ProjectViewportCentered( diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index 2370f07df..a0dc46271 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -2767,7 +2767,7 @@ int UIGuildMemberManageWnd::SendMsg(UIWindow* sender, int message, std::intptr_t if (g_windowMgr.IsFriend(target.name.c_str()) == true) { relation = LookupMessage(MSI_FRIEND); } else { - relation = g_session.IsGuildMemberCharacter(static_cast(target.characterId)) == true ? "GuildMember" : nullptr; + relation = g_session.IsGuildMemberCharacter(static_cast(target.characterId)) == 1 ? "GuildMember" : nullptr; } const std::string filename = ShortcutFilename(target.characterId); g_windowMgr.SendNotice(UIM_MAKE_WHISPER_WINDOW, reinterpret_cast(target.name.c_str()), reinterpret_cast(relation),