diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-19 02:24:02 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-19 02:24:02 +0100 |
| commit | f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a (patch) | |
| tree | c9d5d92427d5157adff44888cf64ac19f9a22d7f /src/render | |
| parent | Merge branch 'lcs' into lcsfont (diff) | |
| download | re3-f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a.tar re3-f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a.tar.gz re3-f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a.tar.bz2 re3-f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a.tar.lz re3-f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a.tar.xz re3-f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a.tar.zst re3-f38ff074c4c709e09cc9c44043fdcf5e8ec92b2a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/render/Font.cpp | 38 | ||||
| -rw-r--r-- | src/render/Font.h | 5 |
2 files changed, 28 insertions, 15 deletions
diff --git a/src/render/Font.cpp b/src/render/Font.cpp index 62b0138d..e1f318aa 100644 --- a/src/render/Font.cpp +++ b/src/render/Font.cpp @@ -256,7 +256,7 @@ CFont::Shutdown(void) #endif Sprite[0].Delete(); Sprite[1].Delete(); - Sprite[2].Delete(); + Sprite[2].Delete(); #ifdef MORE_LANGUAGES if (IsJapanese()) Sprite[3].Delete(); @@ -1512,6 +1512,31 @@ CFont::SetDropColor(CRGBA col) Details.dropColor.a *= Details.alphaFade / 255.0f; } + +//--LCS: done +void +CFont::SetOutlineColor(CRGBA col) +{ + Details.outlineColor = col; + if (Details.alphaFade < 255.0f) + Details.outlineColor.a *= Details.alphaFade / 255.0f; +} + +//--LCS: done +void +CFont::SetOutlineOn(int on) +{ + Details.bOutlineOn = on; +} + +//--LCS: done +void +CFont::SetNewLineAdd(int line) +{ + Details.line = line; +} + +//--LCS: done void CFont::SetDropShadowPosition(int16 pos) { @@ -1556,14 +1581,3 @@ CFont::character_code(uint8 c) return c; return foreign_table[c-128]; } - -void -CFont::SetOutlineColor(CRGBA col) -{ - Details.outlineColor = col; - if (Details.alphaFade < 255.0f) - Details.outlineColor.a *= Details.alphaFade / 255.0f; -} - -void CFont::SetOutlineOn(int on) { Details.bOutlineOn = on; } -void CFont::SetNewLineAdd(int line) { Details.line = line; } diff --git a/src/render/Font.h b/src/render/Font.h index f59ca1e0..b44cf67f 100644 --- a/src/render/Font.h +++ b/src/render/Font.h @@ -37,10 +37,9 @@ struct CFontDetails int nFlashTimer; bool8 anonymous_23; uint32 anonymous_25; - uint32 anonymous_26; CRGBA outlineColor; - int32 bOutlineOn; - uint32 line; + int bOutlineOn; + int line; }; struct CFontRenderState |