[Scummvm-git-logs] scummvm master -> dbbfe1ecd25b35c1ef77813765f94e55588d8675
aquadran
noreply at scummvm.org
Wed Aug 13 08:21:27 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
dbbfe1ecd2 WINTERMUTE: Attempt to fix amigaos4 target
Commit: dbbfe1ecd25b35c1ef77813765f94e55588d8675
https://github.com/scummvm/scummvm/commit/dbbfe1ecd25b35c1ef77813765f94e55588d8675
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2025-08-13T10:21:22+02:00
Commit Message:
WINTERMUTE: Attempt to fix amigaos4 target
Changed paths:
engines/wintermute/base/font/base_font.cpp
engines/wintermute/base/font/base_font_bitmap.cpp
engines/wintermute/base/font/base_font_truetype.cpp
engines/wintermute/base/font/base_font_truetype.h
diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp
index 70ba5ac1bd3..2884ca30f9c 100644
--- a/engines/wintermute/base/font/base_font.cpp
+++ b/engines/wintermute/base/font/base_font.cpp
@@ -68,7 +68,7 @@ int BaseFont::getTextWidth(const byte *text, int maxLength) {
//////////////////////////////////////////////////////////////////////////
-int32 BaseFont::getLetterHeight() {
+int BaseFont::getLetterHeight() {
return 0;
}
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 10e9794c160..1d8c5db561d 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -623,7 +623,7 @@ bool BaseFontBitmap::getWidths() {
}
//////////////////////////////////////////////////////////////////////////
-int32 BaseFontBitmap::getLetterHeight() {
+int BaseFontBitmap::getLetterHeight() {
return _tileHeight;
}
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 771fec964f4..7e469591a06 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -281,8 +281,8 @@ BaseSurface *BaseFontTT::renderTextToTexture(const WideString &text, int width,
//////////////////////////////////////////////////////////////////////////
-int32 BaseFontTT::getLetterHeight() {
- return (int32)_lineHeight;
+int BaseFontTT::getLetterHeight() {
+ return (int)_lineHeight;
}
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h
index b3a3df9938b..ee227348916 100644
--- a/engines/wintermute/base/font/base_font_truetype.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -101,7 +101,7 @@ public:
int getTextWidth(const byte *text, int maxLength = -1) override;
int getTextHeight(const byte *text, int width) override;
void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1) override;
- int32 getLetterHeight() override;
+ int getLetterHeight() override;
bool loadBuffer(char *buffer);
bool loadFile(const Common::String &filename);
More information about the Scummvm-git-logs
mailing list