AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #197 from lioncash/cond 

CFontRenderState: Collapse common switch cases in RefreshColor()
This commit is contained in:
Phillip Stephens 2020-03-08 18:03:17 -07:00 committed by GitHub
parent b01fa0c5bf a490eaf8ff
commit b492c91ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/GuiSys/CFontRenderState.cpp
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;