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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/GuiSys/CTextRenderBuffer.cpp
View File

@@ -177,7 +177,7 @@ void CTextRenderBuffer::AddImage(const zeus::CVector2i& offset, const CFontImage
}
void CTextRenderBuffer::AddCharacter(const zeus::CVector2i& offset, char16_t ch, const zeus::CColor& color) {
if (m_activeFontCh == -1)
if (m_activeFontCh == UINT32_MAX)
return;
BooFontCharacters& chs = m_fontCharacters[m_activeFontCh];
if (x0_mode == EMode::AllocTally)
@@ -199,7 +199,7 @@ void CTextRenderBuffer::AddPaletteChange(const zeus::CColor& main, const zeus::C
}
void CTextRenderBuffer::AddFontChange(const TToken<CRasterFont>& font) {
for (int i = 0; i < m_fontCharacters.size(); ++i) {
for (size_t i = 0; i < m_fontCharacters.size(); ++i) {
BooFontCharacters& chs = m_fontCharacters[i];
if (*chs.m_font.GetObjectTag() == *font.GetObjectTag()) {
m_activeFontCh = i;