ModdingRX/reVC
1
0 Fork 0
mirror of https://github.com/mrxenginner/reVC.git synced 2026-10-11 09:48:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FONT_BANK renamed to FONT_STANDARD"

Browse Source 
This reverts commit 552205dfba.
This commit is contained in:
Fire-Head committed 2020-06-07 05:03:06 +03:00
1 parent 552205dfba
commit 9c0adf6a8f
16 files changed
+50 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/render/Font.cpp
+6 -6
View File
@@ -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;