2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 15:04:56 +00:00

Merge pull request #197 from lioncash/cond

CFontRenderState: Collapse common switch cases in RefreshColor()
This commit is contained in:
2020-03-08 18:03:17 -07:00
committed by GitHub

View File

@@ -50,12 +50,10 @@ void CFontRenderState::RefreshColor(EColorType tp) {
return; return;
switch (x48_font->GetMode()) { switch (x48_font->GetMode()) {
case EColorType::Main: case EColorType::Main:
if (!x64_colorOverrides[0])
x0_drawStrOpts.x4_colors[0] = ConvertToTextureSpace(x54_colors[0]);
break;
case EColorType::Outline: case EColorType::Outline:
if (!x64_colorOverrides[0]) if (!x64_colorOverrides[0]) {
x0_drawStrOpts.x4_colors[0] = ConvertToTextureSpace(x54_colors[0]); x0_drawStrOpts.x4_colors[0] = ConvertToTextureSpace(x54_colors[0]);
}
break; break;
default: default:
break; break;