diff --git a/configure.py b/configure.py index 0e583b27..05e26fc5 100755 --- a/configure.py +++ b/configure.py @@ -1152,7 +1152,7 @@ def MatchingFor(*versions): Object(Matching, "Pack/RPKernel/IRPSysHostIOSocket.cpp"), Object(Matching, "Pack/RPKernel/RPSysHostIOSocketManager.cpp"), Object(Matching, "Pack/RPKernel/RP_DEBUG_STUB_0.cpp"), - Object(NonMatching, "Pack/RPKernel/RPSysTextWriter.cpp"), + Object(Matching, "Pack/RPKernel/RPSysTextWriter.cpp"), Object(Matching, "Pack/RPKernel/RPSysMessage.cpp"), Object(NonMatching, "Pack/RPKernel/RPSysKokeshi.cpp"), Object(NonMatching, "Pack/RPKernel/RPSysKokeshiManager.cpp"), diff --git a/src/Pack/RPKernel/RPSysTextWriter.cpp b/src/Pack/RPKernel/RPSysTextWriter.cpp index 7e4451b5..fed966a5 100644 --- a/src/Pack/RPKernel/RPSysTextWriter.cpp +++ b/src/Pack/RPKernel/RPSysTextWriter.cpp @@ -36,7 +36,7 @@ void RPSysTextWriter::Reset() { EnableFixedWidth(false); SetFixedWidth(0.0f); - SetColorMapping(nw4r::ut::Color::ELEMENT_MIN, nw4r::ut::Color::ELEMENT_MAX); + ResetColorMapping(); SetGradationMode(GRADMODE_NONE); SetTextColor(nw4r::ut::Color::ELEMENT_MAX); @@ -85,14 +85,18 @@ void RPSysTextWriter::PrintfZeroCenter(f32 x, f32 y, const char* pMsg, ...) { switch (pScreen->GetCanvasMode()) { case RPGrpScreen::CANVAS_CC: { - x = x * pScreen->GetWidth() / 2.0f; - y = y * pScreen->GetHeight() / 2.0f; + x = x * pScreen->GetWidth() / 2; + y = y * pScreen->GetHeight() / 2; break; } case RPGrpScreen::CANVAS_LU: { - x = (x + 1.0f) * (pScreen->GetWidth() / 2.0f); - y = (-y + 1.0f) * (pScreen->GetHeight() / 2.0f); + x = (x + 1.0f) * pScreen->GetWidth() / 2; + y = (-y + 1.0f) * pScreen->GetHeight() / 2; + break; + } + + default: { break; } }