From ecedadb8e8893964dfc07916a2eae0c8789b25bd Mon Sep 17 00:00:00 2001 From: Renato Date: Mon, 27 Feb 2023 14:56:13 -0300 Subject: [PATCH 1/4] first commit --- src/client/animatedtext.h | 3 +- src/client/creature.cpp | 2 +- src/client/effect.h | 2 +- src/client/item.cpp | 2 +- src/client/localplayer.cpp | 2 +- src/client/map.cpp | 7 +- src/client/mapview.cpp | 4 +- src/client/minimap.cpp | 3 +- src/client/missile.h | 2 +- src/client/thingtype.cpp | 1 + src/client/uimapanchorlayout.cpp | 1 + src/framework/core/graphicalapplication.cpp | 2 +- src/framework/core/module.cpp | 2 +- src/framework/graphics/drawpool.cpp | 2 +- src/framework/graphics/image.cpp | 3 - src/framework/graphics/particleaffector.h | 2 +- src/framework/graphics/shader.cpp | 3 +- src/framework/platform/win32window.cpp | 14 ++-- src/framework/stdext/string.cpp | 79 ++++----------------- src/framework/ui/uiwidget.cpp | 2 +- 20 files changed, 43 insertions(+), 95 deletions(-) diff --git a/src/client/animatedtext.h b/src/client/animatedtext.h index 9f5c7fc239..74c77632ce 100644 --- a/src/client/animatedtext.h +++ b/src/client/animatedtext.h @@ -22,10 +22,11 @@ #pragma once +#include "declarations.h" #include #include #include -#include "thing.h" +#include // @bindclass class AnimatedText : public LuaObject diff --git a/src/client/creature.cpp b/src/client/creature.cpp index 7b8124d6c8..79eba9f20b 100644 --- a/src/client/creature.cpp +++ b/src/client/creature.cpp @@ -818,7 +818,7 @@ uint16_t Creature::getStepDuration(bool ignoreDiagonal, Otc::Direction dir) stepDuration = ((stepDuration + serverBeat - 1) / serverBeat) * serverBeat; } - if (m_stepCache.mustStabilizeCam = (isLocalPlayer() && stepDuration <= 100)) { + if ((m_stepCache.mustStabilizeCam = (isLocalPlayer() && stepDuration <= 100))) { stepDuration += 10; } diff --git a/src/client/effect.h b/src/client/effect.h index 9dcf716a7f..ab3732f4bd 100644 --- a/src/client/effect.h +++ b/src/client/effect.h @@ -35,7 +35,7 @@ class Effect : public Thing void setId(uint32_t id) override; void setPosition(const Position& position, uint8_t stackPos = 0, bool hasElevation = false) override; - bool isEffect() { return true; } + bool isEffect() override { return true; } bool waitFor(const EffectPtr&); EffectPtr asEffect() { return static_self_cast(); } diff --git a/src/client/item.cpp b/src/client/item.cpp index 130f256e8c..5042bd03ca 100644 --- a/src/client/item.cpp +++ b/src/client/item.cpp @@ -89,7 +89,7 @@ void Item::setPosition(const Position& position, uint8_t stackPos, bool hasEleva { Thing::setPosition(position, stackPos); - if (hasElevation || m_drawConductor.agroup && stackPos > 0) + if (hasElevation || (m_drawConductor.agroup && stackPos > 0)) m_drawConductor.agroup = false; } diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp index 6a1fccf8ee..b35d693fb7 100644 --- a/src/client/localplayer.cpp +++ b/src/client/localplayer.cpp @@ -94,7 +94,7 @@ bool LocalPlayer::retryAutoWalk() m_autoWalkContinueEvent->cancel(); m_autoWalkContinueEvent = g_dispatcher.scheduleEvent( - [capture0 = asLocalPlayer(), this, autoWalkDest = m_autoWalkDestination] { capture0->autoWalk(autoWalkDest, true); }, 200 + [capture0 = asLocalPlayer(), autoWalkDest = m_autoWalkDestination] { capture0->autoWalk(autoWalkDest, true); }, 200 ); m_autoWalkRetries += 1; diff --git a/src/client/map.cpp b/src/client/map.cpp index be507f3dfb..bb55b61d04 100644 --- a/src/client/map.cpp +++ b/src/client/map.cpp @@ -127,7 +127,10 @@ void Map::cleanDynamicThings() void Map::addThing(const ThingPtr& thing, const Position& pos, int16_t stackPos) { - if (!thing || thing->isItem() && thing->getId() == 0) + if (!thing) + return; + + if (thing->isItem() && thing->getId() == 0) return; if (thing->isMissile()) { @@ -438,7 +441,7 @@ void Map::setShowAnimations(bool show) m_animationFlags |= Animation_Show; } else m_animationFlags &= ~Animation_Show; - } +} #endif void Map::beginGhostMode(float opacity) { g_painter->setOpacity(opacity); } diff --git a/src/client/mapview.cpp b/src/client/mapview.cpp index 53d0dbe500..a566e7254e 100644 --- a/src/client/mapview.cpp +++ b/src/client/mapview.cpp @@ -80,7 +80,7 @@ MapView::MapView() : m_pool(g_drawPool.get(DrawPoolType::MAP)) g_painter->setOpacity(fadeOpacity); }); - m_pool->onAfterDraw([this] { + m_pool->onAfterDraw([] { g_painter->resetShaderProgram(); g_painter->resetOpacity(); }); @@ -140,7 +140,7 @@ void MapView::drawFloor() g_drawPool.setOpacity(fadeLevel); Position _camera = cameraPosition; - const bool alwaysTransparent = m_floorViewMode == ALWAYS_WITH_TRANSPARENCY && z < m_cachedFirstVisibleFloor&& _camera.coveredUp(cameraPosition.z - z); + const bool alwaysTransparent = m_floorViewMode == ALWAYS_WITH_TRANSPARENCY && z < m_cachedFirstVisibleFloor && _camera.coveredUp(cameraPosition.z - z); const auto& map = m_cachedVisibleTiles[z]; diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp index 6d1f0dfb6c..217f0fee00 100644 --- a/src/client/minimap.cpp +++ b/src/client/minimap.cpp @@ -415,8 +415,7 @@ void Minimap::saveOtmm(const std::string& fileName) fin->addU8(pos.z); unsigned long len = blockSize; - const int ret = compress2(compressBuffer.data(), &len, (uint8_t*)&(*block).getTiles(), blockSize, COMPRESS_LEVEL); - assert(ret == Z_OK); + compress2(compressBuffer.data(), &len, (uint8_t*)&(*block).getTiles(), blockSize, COMPRESS_LEVEL); fin->addU16(len); fin->write(compressBuffer.data(), len); } diff --git a/src/client/missile.h b/src/client/missile.h index cfe1d03837..d44fd4006f 100644 --- a/src/client/missile.h +++ b/src/client/missile.h @@ -36,7 +36,7 @@ class Missile : public Thing void setId(uint32_t id) override; void setPath(const Position& fromPosition, const Position& toPosition); - bool isMissile() { return true; } + bool isMissile() override { return true; } MissilePtr asMissile() { return static_self_cast(); } diff --git a/src/client/thingtype.cpp b/src/client/thingtype.cpp index db7c310a4f..0c211f78ce 100644 --- a/src/client/thingtype.cpp +++ b/src/client/thingtype.cpp @@ -920,6 +920,7 @@ ThingFlagAttr ThingType::thingAttrToThingFlagAttr(ThingAttr attr) { case ThingAttrPodium: return ThingFlagAttrPodium; case ThingAttrTopEffect: return ThingFlagAttrTopEffect; case ThingAttrMarket: return ThingFlagAttrMarket; + default: break; } return ThingFlagAttrNone; diff --git a/src/client/uimapanchorlayout.cpp b/src/client/uimapanchorlayout.cpp index 98266a3a53..1c0b4b7b69 100644 --- a/src/client/uimapanchorlayout.cpp +++ b/src/client/uimapanchorlayout.cpp @@ -37,6 +37,7 @@ int UIPositionAnchor::getHookedPoint(const UIWidgetPtr& hookedWidget, const UIWi case Fw::AnchorBottom: return hookedRect.bottom(); case Fw::AnchorVerticalCenter: return hookedRect.verticalCenter(); case Fw::AnchorHorizontalCenter: return hookedRect.horizontalCenter(); + case Fw::AnchorNone: break; } } diff --git a/src/framework/core/graphicalapplication.cpp b/src/framework/core/graphicalapplication.cpp index 4682d72960..bd91965f2c 100644 --- a/src/framework/core/graphicalapplication.cpp +++ b/src/framework/core/graphicalapplication.cpp @@ -252,7 +252,7 @@ void GraphicalApplication::resize(const Size& size) g_ui.resize(size); m_onInputEvent = false; - g_mainDispatcher.addEvent([this, size] { + g_mainDispatcher.addEvent([size] { g_graphics.resize(size); g_drawPool.get(DrawPoolType::FOREGROUND)->resize(size); }); diff --git a/src/framework/core/module.cpp b/src/framework/core/module.cpp index 186d7715f2..69ad979628 100644 --- a/src/framework/core/module.cpp +++ b/src/framework/core/module.cpp @@ -27,7 +27,7 @@ #include #include -Module::Module(const std::string_view name) : m_name(name.data()), m_sandboxEnv(g_lua.newSandboxEnv()) {} +Module::Module(const std::string_view name) : m_sandboxEnv(g_lua.newSandboxEnv()), m_name(name.data()) {} bool Module::load() { diff --git a/src/framework/graphics/drawpool.cpp b/src/framework/graphics/drawpool.cpp index 2d028a7366..f60e26005f 100644 --- a/src/framework/graphics/drawpool.cpp +++ b/src/framework/graphics/drawpool.cpp @@ -271,7 +271,7 @@ bool DrawPool::canRepaint(const bool autoUpdateStatus) if (m_shaderRefreshDelay > 0 && (m_refreshDelay == 0 || m_shaderRefreshDelay < m_refreshDelay)) refreshDelay = m_shaderRefreshDelay; - const bool canRepaint = m_status.first != m_status.second || refreshDelay > 0 && m_refreshTimer.ticksElapsed() >= refreshDelay; + const bool canRepaint = (m_status.first != m_status.second) || (refreshDelay > 0 && m_refreshTimer.ticksElapsed() >= refreshDelay); if (canRepaint) { if (static_cast(m_refreshDelay) != autoUpdateStatus) diff --git a/src/framework/graphics/image.cpp b/src/framework/graphics/image.cpp index d7a163d585..cf3aa9389a 100644 --- a/src/framework/graphics/image.cpp +++ b/src/framework/graphics/image.cpp @@ -128,8 +128,6 @@ void Image::blit(const Point& dest, const ImagePtr& other) if (!other) return; - int coloredPixelSize = 0; - const uint8_t* otherPixels = other->getPixelData(); for (int p = 0; p < other->getPixelCount(); ++p) { const int x = p % other->getWidth(); @@ -141,7 +139,6 @@ void Image::blit(const Point& dest, const ImagePtr& other) m_pixels[pos + 1] = otherPixels[p * 4 + 1]; m_pixels[pos + 2] = otherPixels[p * 4 + 2]; m_pixels[pos + 3] = otherPixels[p * 4 + 3]; - ++coloredPixelSize; } } } diff --git a/src/framework/graphics/particleaffector.h b/src/framework/graphics/particleaffector.h index 0eccb8bb60..68cad84dd4 100644 --- a/src/framework/graphics/particleaffector.h +++ b/src/framework/graphics/particleaffector.h @@ -22,8 +22,8 @@ #pragma once -#include #include "declarations.h" +#include class ParticleAffector { diff --git a/src/framework/graphics/shader.cpp b/src/framework/graphics/shader.cpp index 855c467dd1..cd896487c3 100644 --- a/src/framework/graphics/shader.cpp +++ b/src/framework/graphics/shader.cpp @@ -26,8 +26,7 @@ #include #include -Shader::Shader(ShaderType shaderType) : m_shaderType(shaderType), -m_shaderId(glCreateShader(static_cast(shaderType))) +Shader::Shader(ShaderType shaderType) : m_shaderId(glCreateShader(static_cast(shaderType))), m_shaderType(shaderType) { ; if (!m_shaderId) diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp index bc951af175..6ebd1fc275 100644 --- a/src/framework/platform/win32window.cpp +++ b/src/framework/platform/win32window.cpp @@ -424,8 +424,7 @@ bool WIN32Window::isExtensionSupported(const char* ext) //TODO return false; #else - using wglGetExtensionsStringProc = const char* (WINAPI*)(); - const auto wglGetExtensionsString = static_cast(getExtensionProcAddress("wglGetExtensionsStringEXT")); + const auto wglGetExtensionsString = (const char* (WINAPI*)())(getExtensionProcAddress("wglGetExtensionsStringEXT")); if (!wglGetExtensionsString) return false; @@ -443,7 +442,7 @@ void* WIN32Window::getExtensionProcAddress(const char* ext) //TODO return NULL; #else - return static_cast(wglGetProcAddress(ext)); + return (void*)wglGetProcAddress(ext); #endif } @@ -940,8 +939,7 @@ void WIN32Window::setVerticalSync(bool enable) if (!isExtensionSupported("WGL_EXT_swap_control")) return; - using wglSwapIntervalProc = BOOL(WINAPI*)(int); - const auto wglSwapInterval = static_cast(getExtensionProcAddress("wglSwapIntervalEXT")); + const auto wglSwapInterval = (BOOL(WINAPI*)(int))getExtensionProcAddress("wglSwapIntervalEXT"); if (!wglSwapInterval) return; @@ -1054,8 +1052,7 @@ Rect WIN32Window::getClientRect() const { if (m_window) { RECT clientRect = { 0,0,0,0 }; - const int ret = GetClientRect(m_window, &clientRect); - assert(ret != 0); + GetClientRect(m_window, &clientRect); return Rect(Point(clientRect.left, clientRect.top), Point(clientRect.right, clientRect.bottom)); } return Rect(m_position, m_size); @@ -1065,8 +1062,7 @@ Rect WIN32Window::getWindowRect() { if (m_window) { RECT windowRect = { 0,0,0,0 }; - const int ret = GetWindowRect(m_window, &windowRect); - assert(ret != 0); + GetWindowRect(m_window, &windowRect); return Rect(Point(windowRect.left, windowRect.top), Point(windowRect.right, windowRect.bottom)); } return adjustWindowRect(getClientRect()); diff --git a/src/framework/stdext/string.cpp b/src/framework/stdext/string.cpp index 1fd65a887c..4541699e88 100644 --- a/src/framework/stdext/string.cpp +++ b/src/framework/stdext/string.cpp @@ -75,71 +75,22 @@ namespace stdext bool is_valid_utf8(const std::string_view src) { - const auto* bytes = src.data(); - while (*bytes) { - if ((// ASCII - // use bytes[0] <= 0x7F to allow ASCII control characters - bytes[0] == 0x09 || - bytes[0] == 0x0A || - bytes[0] == 0x0D || - (0x20 <= bytes[0] && bytes[0] <= 0x7E) - ) - ) { - bytes += 1; - continue; + int c, i, ix, n, j; + for (i = 0, ix = src.length(); i < ix; i++) { + c = (unsigned char)src[i]; + //if (c==0x09 || c==0x0a || c==0x0d || (0x20 <= c && c <= 0x7e) ) n = 0; // is_printable_ascii + if (0x00 <= c && c <= 0x7f) n = 0; // 0bbbbbbb + else if ((c & 0xE0) == 0xC0) n = 1; // 110bbbbb + else if (c == 0xed && i < (ix - 1) && ((unsigned char)src[i + 1] & 0xa0) == 0xa0) return false; //U+d800 to U+dfff + else if ((c & 0xF0) == 0xE0) n = 2; // 1110bbbb + else if ((c & 0xF8) == 0xF0) n = 3; // 11110bbb + //else if (($c & 0xFC) == 0xF8) n=4; // 111110bb //byte 5, unnecessary in 4 byte UTF-8 + //else if (($c & 0xFE) == 0xFC) n=5; // 1111110b //byte 6, unnecessary in 4 byte UTF-8 + else return false; + for (j = 0; j < n && i < ix; j++) { // n bytes matching 10bbbbbb follow ? + if ((++i == ix) || (((unsigned char)src[i] & 0xC0) != 0x80)) + return false; } - if ((// non-overlong 2-byte - (0xC2 <= bytes[0] && bytes[0] <= 0xDF) && - (0x80 <= bytes[1] && bytes[1] <= 0xBF) - ) - ) { - bytes += 2; - continue; - } - if ((// excluding overlongs - bytes[0] == 0xE0 && - (0xA0 <= bytes[1] && bytes[1] <= 0xBF) && - (0x80 <= bytes[2] && bytes[2] <= 0xBF) - ) || - (// straight 3-byte - ((0xE1 <= bytes[0] && bytes[0] <= 0xEC) || - bytes[0] == 0xEE || - bytes[0] == 0xEF) && - (0x80 <= bytes[1] && bytes[1] <= 0xBF) && - (0x80 <= bytes[2] && bytes[2] <= 0xBF) - ) || - (// excluding surrogates - bytes[0] == 0xED && - (0x80 <= bytes[1] && bytes[1] <= 0x9F) && - (0x80 <= bytes[2] && bytes[2] <= 0xBF) - ) - ) { - bytes += 3; - continue; - } - if ((// planes 1-3 - bytes[0] == 0xF0 && - (0x90 <= bytes[1] && bytes[1] <= 0xBF) && - (0x80 <= bytes[2] && bytes[2] <= 0xBF) && - (0x80 <= bytes[3] && bytes[3] <= 0xBF) - ) || - (// planes 4-15 - (0xF1 <= bytes[0] && bytes[0] <= 0xF3) && - (0x80 <= bytes[1] && bytes[1] <= 0xBF) && - (0x80 <= bytes[2] && bytes[2] <= 0xBF) && - (0x80 <= bytes[3] && bytes[3] <= 0xBF) - ) || - (// plane 16 - bytes[0] == 0xF4 && - (0x80 <= bytes[1] && bytes[1] <= 0x8F) && - (0x80 <= bytes[2] && bytes[2] <= 0xBF) && - (0x80 <= bytes[3] && bytes[3] <= 0xBF) - ) - ) { - bytes += 4; - continue; - } - return false; } return true; } diff --git a/src/framework/ui/uiwidget.cpp b/src/framework/ui/uiwidget.cpp index 03a2c9de57..a457aafa7b 100644 --- a/src/framework/ui/uiwidget.cpp +++ b/src/framework/ui/uiwidget.cpp @@ -107,7 +107,7 @@ void UIWidget::drawSelf(DrawPoolType drawPane) void UIWidget::drawChildren(const Rect& visibleRect, DrawPoolType drawPane) { // draw children - for (const auto child : m_children) { // don't use auto& + for (const auto& child : m_children) { // render only visible children with a valid rect inside parent rect if (!child || !child->isExplicitlyVisible() || !child->getRect().isValid() || child->getOpacity() <= Fw::MIN_ALPHA) continue; From 849c6e2f2a8cb3ffcde76ff2aeb792fe77df3ee6 Mon Sep 17 00:00:00 2001 From: Renato Date: Mon, 27 Feb 2023 15:30:02 -0300 Subject: [PATCH 2/4] fix warnings --- src/framework/graphics/particleaffector.h | 4 +++- src/framework/otml/otmlnode.h | 2 ++ src/framework/sound/soundfile.h | 2 ++ src/framework/ui/uianchorlayout.h | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/framework/graphics/particleaffector.h b/src/framework/graphics/particleaffector.h index 68cad84dd4..9ea0b30ecd 100644 --- a/src/framework/graphics/particleaffector.h +++ b/src/framework/graphics/particleaffector.h @@ -28,9 +28,11 @@ class ParticleAffector { public: + virtual ~ParticleAffector() {} // fix clang warning + void update(float elapsedTime); virtual void load(const OTMLNodePtr& node); - virtual void updateParticle(const ParticlePtr&, float) const {} + virtual void updateParticle(const ParticlePtr&, float) const = 0; bool hasFinished() const { return m_finished; } diff --git a/src/framework/otml/otmlnode.h b/src/framework/otml/otmlnode.h index 801dcb5187..b492c7fef3 100644 --- a/src/framework/otml/otmlnode.h +++ b/src/framework/otml/otmlnode.h @@ -27,6 +27,8 @@ class OTMLNode : public std::enable_shared_from_this { public: + virtual ~OTMLNode() {} // fix clang warning + static OTMLNodePtr create(const std::string_view tag = "", bool unique = false); static OTMLNodePtr create(const std::string_view tag, const std::string_view value); diff --git a/src/framework/sound/soundfile.h b/src/framework/sound/soundfile.h index 6493065dff..d533a0897c 100644 --- a/src/framework/sound/soundfile.h +++ b/src/framework/sound/soundfile.h @@ -28,6 +28,8 @@ class SoundFile : public std::enable_shared_from_this { public: + virtual ~SoundFile() {} // fix clang warning + SoundFile(const FileStreamPtr& fileStream) : m_file(fileStream) {} static SoundFilePtr loadSoundFile(const std::string& filename); diff --git a/src/framework/ui/uianchorlayout.h b/src/framework/ui/uianchorlayout.h index 62b47efcc8..1dbc9aad95 100644 --- a/src/framework/ui/uianchorlayout.h +++ b/src/framework/ui/uianchorlayout.h @@ -29,6 +29,8 @@ class UIAnchor :public std::enable_shared_from_this { public: + virtual ~UIAnchor() {} // fix clang warning + UIAnchor(Fw::AnchorEdge anchoredEdge, std::string_view hookedWidgetId, Fw::AnchorEdge hookedEdge) : m_anchoredEdge(anchoredEdge), m_hookedEdge(hookedEdge), m_hookedWidgetId(std::string{ hookedWidgetId }) {} From 85f8d76ef962ed647ca3c8dbe45aeb08c7c0ef12 Mon Sep 17 00:00:00 2001 From: Renato Date: Mon, 27 Feb 2023 16:24:50 -0300 Subject: [PATCH 3/4] update --- vc17/otclient.vcxproj | 41 +-------------------------- vc17/settings.props | 65 ++++++++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 66 deletions(-) diff --git a/vc17/otclient.vcxproj b/vc17/otclient.vcxproj index 3948a312ba..d843c61ce5 100644 --- a/vc17/otclient.vcxproj +++ b/vc17/otclient.vcxproj @@ -100,6 +100,7 @@ true + false x86-windows @@ -165,26 +166,6 @@ cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\ true false true - - advapi32.lib; - crypt32.lib; - dbghelp.lib; - gdi32.lib; - glew32.lib; - kernel32.lib; - lua51.lib; - ogg.lib; - ole32.lib; - openal32.lib; - opengl32.lib; - physfs-static.lib; - shell32.lib; - user32.lib; - vorbis.lib; - vorbisfile.lib; - zlib.lib; - winmm.lib - if NOT EXIST "../src/protobuf/appearances.pb.cc" ( @@ -224,26 +205,6 @@ IF %ERRORLEVEL% EQU 0 ( true true true - - advapi32.lib; - crypt32.lib; - dbghelp.lib; - gdi32.lib; - glew32.lib; - kernel32.lib; - lua51.lib; - ogg.lib; - ole32.lib; - openal32.lib; - opengl32.lib; - physfs-static.lib; - shell32.lib; - user32.lib; - vorbis.lib; - vorbisfile.lib; - zlib.lib; - winmm.lib - if NOT EXIST "../src/protobuf/appearances.pb.cc" ( diff --git a/vc17/settings.props b/vc17/settings.props index a67335515a..be108fe511 100644 --- a/vc17/settings.props +++ b/vc17/settings.props @@ -14,40 +14,53 @@ - glew32.lib; - zlib.lib; - physfs.lib; - openal32.lib; - lua51.lib; - ogg.lib; - vorbisfile.lib; - vorbis.lib; - opengl32.lib; - dbghelp.lib; - kernel32.lib; - user32.lib; - shell32.lib; - gdi32.lib; - advapi32.lib; + advapi32.lib; + crypt32.lib; + dbghelp.lib; + gdi32.lib; + discord-rpc.lib; + glew32.lib; + kernel32.lib; + ole32.lib; + physfs-static.lib; + shell32.lib; + user32.lib; + winmm.lib; + libcrypto.lib; + libprotobuf.lib; + libssl.lib; + lua51.lib; + lzma.lib; + ogg.lib; + openal32.lib; + opengl32.lib; + vorbis.lib; + vorbisfile.lib; + zlib.lib; + advapi32.lib; + discord-rpc.lib; + dbghelp.lib; + gdi32.lib; glew32d.lib; - zlibd.lib; - physfs.lib; - openal32.lib; + kernel32.lib; lua51.lib; ogg.lib; - vorbisfile.lib; - vorbis.lib; + lzma.lib; + libssl.lib; + libcrypto.lib; + libprotobufd.lib; opengl32.lib; - dbghelp.lib; - kernel32.lib; - user32.lib; + physfs.lib; shell32.lib; - gdi32.lib; - advapi32.lib; - winmm.lib + user32.lib; + vorbis.lib; + vorbisfile.lib; + winmm.lib; + zlibd.lib; + openal32.lib; From 97e8126c01c163ab44e6615f1d1d513ffe1b2263 Mon Sep 17 00:00:00 2001 From: Renato Date: Mon, 27 Feb 2023 16:59:56 -0300 Subject: [PATCH 4/4] Update eventdispatcher.cpp --- src/framework/core/eventdispatcher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/framework/core/eventdispatcher.cpp b/src/framework/core/eventdispatcher.cpp index c4334276f7..411edb8c7f 100644 --- a/src/framework/core/eventdispatcher.cpp +++ b/src/framework/core/eventdispatcher.cpp @@ -76,7 +76,7 @@ void EventDispatcher::poll() break; } - for (int_fast32_t i = -1; ++i < m_pollEventsSize;) { + for (int_fast32_t i = -1; ++i < static_cast(m_pollEventsSize);) { const auto event = m_eventList.front(); m_eventList.pop_front(); if (isMainDispatcher) ul.unlock();