diff options
| author | Johannes Schickel | 2011-07-01 05:38:20 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-07-01 05:42:54 +0200 |
| commit | 933ee5b156fd8031a75b84bae5329843221208dc (patch) | |
| tree | 17c2c8480e338aeae0479608e662a0e3130a34a9 /graphics/sjis.h | |
| parent | 685e32dbd7bf352c27e935b930ea24dc8b3380da (diff) | |
| download | scummvm-rg350-933ee5b156fd8031a75b84bae5329843221208dc.tar.gz scummvm-rg350-933ee5b156fd8031a75b84bae5329843221208dc.tar.bz2 scummvm-rg350-933ee5b156fd8031a75b84bae5329843221208dc.zip | |
GRAPHICS: Remove default values from FontSJIS::drawChar.
drawChar is overloaded in FontSJIS. One takes a "Surface &" as first
parameter another one "void *", they furthermore have the exact same
number of required parameters. The one "void *" just had a few extra
parameters with default values. This resulted in a bug in SCUMM, where
"VirtScreen *" (a subclass of Surface) was passed instead of "VirtScreen &"
and thus the method taking "void *" was incorrectly used.
To make it easier to spot such bugs in the future I just removed the default
values and thus disallow such calls.
Diffstat (limited to 'graphics/sjis.h')
| -rw-r--r-- | graphics/sjis.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/sjis.h b/graphics/sjis.h index 90357af446..58bcaf121f 100644 --- a/graphics/sjis.h +++ b/graphics/sjis.h @@ -123,10 +123,10 @@ public: * @param bpp bytes per pixel of the destination buffer * @param c1 forground color * @param c2 outline color - * @param maxW max draw width (to ensure that character drawing takes place within surface boundaries) - * @param maxH max draw height (to ensure that character drawing takes place within surface boundaries) + * @param maxW max draw width (to ensure that character drawing takes place within surface boundaries), -1 = no check + * @param maxH max draw height (to ensure that character drawing takes place within surface boundaries), -1 = no check */ - virtual void drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, uint32 c2, int maxW = -1, int maxH = -1) const = 0; + virtual void drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, uint32 c2, int maxW, int maxH) const = 0; }; /** |