libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression introduced with r44907.

Browse Source 
svn-id: r44911
This commit is contained in:
Johannes Schickel 2009-10-11 12:01:20 +00:00
parent 67c6e92efb
commit e90f337bd2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/kyra/screen.cpp
View File

@ -1135,7 +1135,7 @@ int Screen::getFontWidth() const {
int Screen::getCharWidth(uint16 c) const {
const int width = _fonts[_currentFont]->getCharWidth(c);
return width + (_currentFont != FID_SJIS_FNT) ? _charWidth : 0;
return width + ((_currentFont != FID_SJIS_FNT) ? _charWidth : 0);
}
int Screen::getTextWidth(const char *str) const {
@ -3315,7 +3315,7 @@ SJISFont::SJISFont(Screen *s, Graphics::FontSJIS *font, const uint8 invisColor,
_sjisWidth = _font->getMaxFontWidth() >> 1;
_fontHeight = _font->getFontHeight() >> 1;
_asciiWidth = _font->getCharWidth('a');
_asciiWidth = _font->getCharWidth('a') >> 1;
}
void SJISFont::unload() {
@ -3332,10 +3332,10 @@ int SJISFont::getWidth() const {
}
int SJISFont::getCharWidth(uint16 c) const {
if ((c & 0xFF) >= 0xA1 && (c & 0xFF) <= 0xDF)
return _sjisWidth;
else
if (c <= 0x7F || (c >= 0xA1 && c <= 0xDF))
return _asciiWidth;
else
return _sjisWidth;
}
void SJISFont::setColorMap(const uint8 *src) {