summaryrefslogtreecommitdiff
path: root/libs/JSystem/J2DGraph/J2DPrint.cpp
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2023-02-01 16:22:08 +0200
committerTal Hayon <talhayon1@gmail.com>2023-02-01 16:40:19 +0200
commit61d2b9a5c1fe0d7a340935d0b2e68ef3d5296f73 (patch)
tree02b7d18fdfbf01ef339f0a2d7346f5f3b4df540b /libs/JSystem/J2DGraph/J2DPrint.cpp
parentd5d32236a0b9c1f666f87f4d38c5e027d2588831 (diff)
Work on dvdlow, OSTime fix and various nonmatching
Diffstat (limited to 'libs/JSystem/J2DGraph/J2DPrint.cpp')
-rw-r--r--libs/JSystem/J2DGraph/J2DPrint.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp
index c72d665648..b523d89d88 100644
--- a/libs/JSystem/J2DGraph/J2DPrint.cpp
+++ b/libs/JSystem/J2DGraph/J2DPrint.cpp
@@ -152,7 +152,7 @@ SECTION_SDATA2 static f64 lit_650 = 4503601774854144.0 /* cast s32 to float */;
/* 802F4468-802F4658 2EEDA8 01F0+00 1/1 0/0 0/0 .text
* private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb
*/
-// close
+// matches with float literals
#ifdef NONMATCHING
void J2DPrint::private_initiate(JUTFont* pFont, f32 param_1, f32 param_2, JUtility::TColor param_3,
JUtility::TColor param_4, JUtility::TColor param_5,
@@ -165,10 +165,13 @@ void J2DPrint::private_initiate(JUTFont* pFont, f32 param_1, f32 param_2, JUtili
field_0x4c = 32.0f;
if (mFont != NULL) {
- if (!param_7) {
- param_2 = mFont->getLeading();
+ f32 temp;
+ if (param_7 == false) {
+ temp = param_2;
+ } else {
+ temp = mFont->getLeading();
}
- field_0x4c = param_2;
+ field_0x4c = temp;
}
field_0x5a = 1;