AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows fixes

This commit is contained in:
Jack Andersen 2017-01-21 23:06:03 -10:00
parent b3fd6d9eea
commit eb955c53ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Audio/CAudioSys.cpp
View File

@ -61,8 +61,8 @@ void CAudioSys::SysUnloadAudioGroupSet(const std::string& name)
if (!set) if (!set)
return; return;
mpGroupSetResNameDB.erase(set.GetObjectTag()->id);
mpGroupSetDB.erase(name); mpGroupSetDB.erase(name);
mpGroupSetResNameDB.erase(set.GetObjectTag()->id);
} }
bool CAudioSys::SysIsGroupSetLoaded(const std::string& name) bool CAudioSys::SysIsGroupSetLoaded(const std::string& name)

6
Runtime/GuiSys/CRasterFont.cpp
View File

@ -53,8 +53,8 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store)
s32 cellHeight = in.readInt32Big(); s32 cellHeight = in.readInt32Big();
s32 baseline = in.readInt32Big(); s32 baseline = in.readInt32Big();
s32 kernStart = in.readInt32Big(); s32 kernStart = in.readInt32Big();
xc_glyphs[i] = std::make_pair(chr, CGlyph(a, b, c, startU, startV, endU, endV, xc_glyphs.push_back(std::make_pair(chr, CGlyph(a, b, c, startU, startV, endU, endV,
cellWidth, cellHeight, baseline, kernStart)); cellWidth, cellHeight, baseline, kernStart)));
} }
std::sort(xc_glyphs.begin(), xc_glyphs.end(), [=](auto& a, auto& b) -> bool{ 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 first = in.readUint16Big();
wchar_t second = in.readUint16Big(); wchar_t second = in.readUint16Big();
s32 howMuch = in.readUint32Big(); s32 howMuch = in.readUint32Big();
x1c_kerning[i] = CKernPair(first, second, howMuch); x1c_kerning.emplace_back(first, second, howMuch);
} }
if (magic == SBIG('FONT') && version <= 2) if (magic == SBIG('FONT') && version <= 2)

2
hecl

@ -1 +1 @@
Subproject commit 51fc07f0a0f6e7c093f722fcb48454c65fa5f0ca Subproject commit e84a639ed1c213fa9e50f4f15ea43f8eb391986e