[Scummvm-git-logs] scummvm master -> 8fa1b08f6afc08a6f946dab8eb89a36b5b51d65b

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8fa1b08f6a DGDS: Rename function to avoid shadowing


Commit: 8fa1b08f6afc08a6f946dab8eb89a36b5b51d65b
    https://github.com/scummvm/scummvm/commit/8fa1b08f6afc08a6f946dab8eb89a36b5b51d65b
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-07-01T07:38:15+10:00

Commit Message:
DGDS: Rename function to avoid shadowing

Changed paths:
    engines/dgds/font.cpp
    engines/dgds/font.h


diff --git a/engines/dgds/font.cpp b/engines/dgds/font.cpp
index b7ce90f0974..2f4990720ea 100644
--- a/engines/dgds/font.cpp
+++ b/engines/dgds/font.cpp
@@ -81,7 +81,7 @@ static inline bool isSet(const byte *data, uint bit) {
 	return data[bit / 8] & (1 << (7 - (bit % 8)));
 }
 
-void DgdsFont::drawChar(Graphics::Surface* dst, int pos, int x, int y, int w, uint32 color) const {
+void DgdsFont::drawDgdsChar(Graphics::Surface* dst, int pos, int x, int y, int w, uint32 color) const {
 	const Common::Rect destRect(Common::Point(x, y), w, _h);
 	Common::Rect clippedDestRect(dst->w, dst->h);
 	clippedDestRect.clip(destRect);
@@ -123,7 +123,7 @@ void FFont::drawChar(Graphics::Surface* dst, uint32 chr, int x, int y, uint32 co
 		return;
 
 	int pos = charOffset(chr);
-	DgdsFont::drawChar(dst, pos, x, y, _w, color);
+	drawDgdsChar(dst, pos, x, y, _w, color);
 }
 
 FFont *FFont::load(Common::SeekableReadStream &input) {
@@ -162,7 +162,7 @@ void PFont::drawChar(Graphics::Surface* dst, uint32 chr, int x, int y, uint32 co
 
 	int pos = charOffset(chr);
 	int w = getCharWidth(chr);
-	DgdsFont::drawChar(dst, pos, x, y, w, color);
+	drawDgdsChar(dst, pos, x, y, w, color);
 }
 
 int PFont::getCharWidth(uint32 chr) const {
diff --git a/engines/dgds/font.h b/engines/dgds/font.h
index 2ed09c56072..80dac9dec46 100644
--- a/engines/dgds/font.h
+++ b/engines/dgds/font.h
@@ -60,7 +60,7 @@ protected:
 	byte _count;
 	const byte *_glyphs;
 
-	void drawChar(Graphics::Surface* dst, int pos, int x, int y, int w, uint32 color) const;
+	void drawDgdsChar(Graphics::Surface* dst, int pos, int x, int y, int w, uint32 color) const;
 	bool hasChar(byte chr) const;
 	virtual int charOffset(byte chr) const = 0;
 };