From eb955c53ec854b2189d0286df61a022ceb5dded0 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 21 Jan 2017 23:06:03 -1000 Subject: [PATCH] Windows fixes --- Runtime/Audio/CAudioSys.cpp | 2 +- Runtime/GuiSys/CRasterFont.cpp | 6 +++--- hecl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Runtime/Audio/CAudioSys.cpp b/Runtime/Audio/CAudioSys.cpp index 0af737e10..e6fb25daa 100644 --- a/Runtime/Audio/CAudioSys.cpp +++ b/Runtime/Audio/CAudioSys.cpp @@ -61,8 +61,8 @@ void CAudioSys::SysUnloadAudioGroupSet(const std::string& name) if (!set) return; - mpGroupSetResNameDB.erase(set.GetObjectTag()->id); mpGroupSetDB.erase(name); + mpGroupSetResNameDB.erase(set.GetObjectTag()->id); } bool CAudioSys::SysIsGroupSetLoaded(const std::string& name) diff --git a/Runtime/GuiSys/CRasterFont.cpp b/Runtime/GuiSys/CRasterFont.cpp index 1fc4fde15..933004446 100644 --- a/Runtime/GuiSys/CRasterFont.cpp +++ b/Runtime/GuiSys/CRasterFont.cpp @@ -53,8 +53,8 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store) s32 cellHeight = in.readInt32Big(); s32 baseline = in.readInt32Big(); s32 kernStart = in.readInt32Big(); - xc_glyphs[i] = std::make_pair(chr, CGlyph(a, b, c, startU, startV, endU, endV, - cellWidth, cellHeight, baseline, kernStart)); + xc_glyphs.push_back(std::make_pair(chr, CGlyph(a, b, c, startU, startV, endU, endV, + cellWidth, cellHeight, baseline, kernStart))); } std::sort(xc_glyphs.begin(), xc_glyphs.end(), [=](auto& a, auto& b) -> bool{ @@ -69,7 +69,7 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store) wchar_t first = in.readUint16Big(); wchar_t second = in.readUint16Big(); s32 howMuch = in.readUint32Big(); - x1c_kerning[i] = CKernPair(first, second, howMuch); + x1c_kerning.emplace_back(first, second, howMuch); } if (magic == SBIG('FONT') && version <= 2) diff --git a/hecl b/hecl index 51fc07f0a..e84a639ed 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 51fc07f0a0f6e7c093f722fcb48454c65fa5f0ca +Subproject commit e84a639ed1c213fa9e50f4f15ea43f8eb391986e