zone/zonetool
zone/zonetool
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #51 from GEEKiDoS/develop

Browse Source 
Fix crash while building font
This commit is contained in:
RektInator 2020-12-30 21:17:53 +01:00 committed by GitHub
commit 6d09fd7e2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/IW5/Assets/FontDef.cpp
View File

@ -126,16 +126,16 @@ namespace ZoneTool
for (int i = 0; i < font->glyphCount; i++) for (int i = 0; i < font->glyphCount; i++)
{ {
font->glyphs[i].letter = fontdata["glyphs"][i].get<unsigned __int16>(); font->glyphs[i].letter = fontdata["glyphs"][i]["letter"].get<unsigned __int16>();
font->glyphs[i].x0 = fontdata["glyphs"][i].get<char>(); font->glyphs[i].x0 = fontdata["glyphs"][i]["x0"].get<char>();
font->glyphs[i].y0 = fontdata["glyphs"][i].get<char>(); font->glyphs[i].y0 = fontdata["glyphs"][i]["y0"].get<char>();
font->glyphs[i].dx = fontdata["glyphs"][i].get<char>(); font->glyphs[i].dx = fontdata["glyphs"][i]["dx"].get<char>();
font->glyphs[i].pixelWidth = fontdata["glyphs"][i].get<char>(); font->glyphs[i].pixelWidth = fontdata["glyphs"][i]["pixelWidth"].get<char>();
font->glyphs[i].pixelHeight = fontdata["glyphs"][i].get<char>(); font->glyphs[i].pixelHeight = fontdata["glyphs"][i]["pixelHeight"].get<char>();
font->glyphs[i].s0, fontdata["glyphs"][i].get<float>(); font->glyphs[i].s0 = fontdata["glyphs"][i]["s0"].get<float>();
font->glyphs[i].t0, fontdata["glyphs"][i].get<float>(); font->glyphs[i].t0 = fontdata["glyphs"][i]["t0"].get<float>();
font->glyphs[i].s1, fontdata["glyphs"][i].get<float>(); font->glyphs[i].s1 = fontdata["glyphs"][i]["s1"].get<float>();
font->glyphs[i].t1, fontdata["glyphs"][i].get<float>(); font->glyphs[i].t1 = fontdata["glyphs"][i]["t1"].get<float>();
} }
return font; return font;