[Scummvm-git-logs] scummvm master -> 6307e0575147aea8cef78ae2404e63779e9d5418

phcoder noreply at scummvm.org
Thu Mar 16 20:24:26 UTC 2023


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:
6307e05751 GRAPHICS: Fix wrong order of arguments in big5 char drawing


Commit: 6307e0575147aea8cef78ae2404e63779e9d5418
    https://github.com/scummvm/scummvm/commit/6307e0575147aea8cef78ae2404e63779e9d5418
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-03-16T21:24:21+01:00

Commit Message:
GRAPHICS: Fix wrong order of arguments in big5 char drawing

Changed paths:
    graphics/big5.cpp


diff --git a/graphics/big5.cpp b/graphics/big5.cpp
index 87a283e8b1b..dc8aeb4c76f 100644
--- a/graphics/big5.cpp
+++ b/graphics/big5.cpp
@@ -110,17 +110,17 @@ template <class T> bool Big5Font::drawReal(byte *dest, uint16 textChar, int maxX
 }
 
 bool Big5Font::drawBig5Char(byte *dest, uint16 ch, int maxX, int maxY, uint32 destPitch, byte color, byte outlineColor) const {
-	return drawReal<uint8>(dest, maxX, maxY, destPitch, ch, color, outlineColor, true);
+	return drawReal<uint8>(dest, ch, maxX, maxY, destPitch, color, outlineColor, true);
 }
 
 bool Big5Font::drawBig5Char(Graphics::Surface *surf, uint16 ch, const Common::Point &pt, uint32 color) const {
 	switch(surf->format.bytesPerPixel) {
 	case 4:
-		return drawReal<uint32>((byte*)surf->getBasePtr(pt.x, pt.y), surf->w - pt.x, surf->h - pt.y, surf->pitch, ch, color, 0, false);
+		return drawReal<uint32>((byte*)surf->getBasePtr(pt.x, pt.y), ch, surf->w - pt.x, surf->h - pt.y, surf->pitch, color, 0, false);
 	case 2:
-		return drawReal<uint16>((byte*)surf->getBasePtr(pt.x, pt.y), surf->w - pt.x, surf->h - pt.y, surf->pitch, ch, color, 0, false);
+		return drawReal<uint16>((byte*)surf->getBasePtr(pt.x, pt.y), ch, surf->w - pt.x, surf->h - pt.y, surf->pitch, color, 0, false);
 	case 1:
-		return drawReal<uint8>((byte*)surf->getBasePtr(pt.x, pt.y), surf->w - pt.x, surf->h - pt.y, surf->pitch, ch, color, 0, false);
+		return drawReal<uint8>((byte*)surf->getBasePtr(pt.x, pt.y), ch, surf->w - pt.x, surf->h - pt.y, surf->pitch, color, 0, false);
 	default:
 		error("Big5 font for bpp=%d is not supported", surf->format.bytesPerPixel);
 	}




More information about the Scummvm-git-logs mailing list