diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-22 23:30:41 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-22 23:30:41 +0100 |
| commit | adb4927504784f101a327c07425a7d05d00c2602 (patch) | |
| tree | 00c5646fc6c2b206836f71143bf7441de2c98433 /src/text.c | |
| parent | 6dffa6d17c35fe13f5878bd7bbf8a3fe1054c20c (diff) | |
| parent | ebbe826133661d3faabc17f9167fa565b405514a (diff) | |
Merge with master
Diffstat (limited to 'src/text.c')
| -rw-r--r-- | src/text.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/text.c b/src/text.c index 07c15596e..39e412633 100644 --- a/src/text.c +++ b/src/text.c @@ -1858,7 +1858,7 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32) return NULL; } -u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) +s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) { bool8 isJapanese; int minGlyphWidth; @@ -1868,7 +1868,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) u32 lineWidth; const u8 *bufferPointer; int glyphWidth; - u32 width; + s32 width; isJapanese = 0; minGlyphWidth = 0; @@ -2028,7 +2028,8 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) if (lineWidth > width) return lineWidth; - return width; + else + return width; } u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str) |