AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

CStringTable and CRasterFont fixes

Browse Source
This commit is contained in:
Phillip Stephens
2016-08-16 22:40:25 -07:00
parent 13cb48e3f9
commit fd26dd56c3
5 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/GuiSys/CRasterFont.cpp
View File

@@ -32,7 +32,7 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store)
std::string name= in.readString();
u32 txtrId = in.readUint32Big();
x30_fontInfo = CFontInfo(tmp1, tmp2, tmp3, tmp4, name.c_str());
x80_texture = store.GetObj({'TXTR', txtrId});
x80_texture = store.GetObj({FOURCC('TXTR'), txtrId});
x2c_mode = EColorType(in.readUint32Big());
u32 glyphCount = in.readUint32Big();
@@ -84,7 +84,7 @@ void CRasterFont::SinglePassDrawString(const CDrawStringOptions& opts, int x, in
const wchar_t* chr = str;
const CGlyph* prevGlyph = nullptr;
while (*chr == '\0')
while (*chr != '\0')
{
const CGlyph* glyph = GetGlyph(*chr);
if (glyph)