summaryrefslogtreecommitdiffstats
path: root/src/render/Font.cpp
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2020-06-07 04:03:06 +0200
committerFire-Head <Fire-Head@users.noreply.github.com>2020-06-07 04:03:06 +0200
commit9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb (patch)
treea7f73dc3672ecbd60bf8a9c07fdc359823603292 /src/render/Font.cpp
parentFONT_BANK renamed to FONT_STANDARD (diff)
downloadre3-9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb.tar
re3-9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb.tar.gz
re3-9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb.tar.bz2
re3-9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb.tar.lz
re3-9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb.tar.xz
re3-9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb.tar.zst
re3-9c0adf6a8f5b7f49ae233d2fce8a7ceaedc34cfb.zip
Diffstat (limited to 'src/render/Font.cpp')
-rw-r--r--src/render/Font.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 33b2dca1..ef665fae 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -250,7 +250,7 @@ CFont::Initialise(void)
SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));
SetBackGroundOnlyTextOff();
SetPropOn();
- SetFontStyle(FONT_STANDARD);
+ SetFontStyle(FONT_BANK);
SetRightJustifyWrap(0.0f);
SetAlphaFade(255.0f);
SetDropShadowPosition(0);
@@ -348,7 +348,7 @@ CFont::PrintChar(float x, float y, wchar c)
}
#endif
- if(Details.style == FONT_STANDARD || Details.style == FONT_HEADING){
+ if(Details.style == FONT_BANK || Details.style == FONT_HEADING){
if(Details.dropShadowPosition != 0){
CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank
CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition),
@@ -828,7 +828,7 @@ CFont::GetCharacterWidth(wchar c)
if (IsJapanese()) {
if (!Details.proportional)
return Size[0][Details.style][192];
- if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_STANDARD) {
+ if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_BANK) {
switch (Details.style)
{
case FONT_JAPANESE:
@@ -844,7 +844,7 @@ CFont::GetCharacterWidth(wchar c)
{
case FONT_JAPANESE:
return 29.4f;
- case FONT_STANDARD:
+ case FONT_BANK:
return 10.0f;
case FONT_PAGER:
return 31.5f;
@@ -874,7 +874,7 @@ CFont::GetCharacterSize(wchar c)
{
if (!Details.proportional)
return Size[0][Details.style][192] * Details.scaleX;
- if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_STANDARD) {
+ if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_BANK) {
switch (Details.style)
{
case FONT_JAPANESE:
@@ -890,7 +890,7 @@ CFont::GetCharacterSize(wchar c)
{
case FONT_JAPANESE:
return 29.4f * Details.scaleX;
- case FONT_STANDARD:
+ case FONT_BANK:
return 10.0f * Details.scaleX;
case FONT_PAGER:
return 31.5f * Details.scaleX;