SCUMM/FM-TOWNS JAPANESE: implement flipped text

(used in the MI1 circus scene after Guybrush gets shot out of the cannon)

svn-id: r53616

4 files changed, 89 insertions, 30 deletions

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index f08fb4e7ef..8b0a87f0c8 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -3313,7 +3313,7 @@ SJISFont::SJISFont(Screen *s, Graphics::FontSJIS *font, const uint8 invisColor,
     : _colorMap(0), _font(font), _invisColor(invisColor), _is16Color(is16Color), _screen(s) {
 	assert(_font);
 
-	_font->setShadowMode(outlineSize ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone);
+	_font->setDrawingMode(outlineSize ? Graphics::FontSJIS::kOutlineMode : Graphics::FontSJIS::kDefaultMode);
 
 	_sjisWidth = _font->getMaxFontWidth() >> 1;
 	_fontHeight = _font->getFontHeight() >> 1;
@@ -3345,9 +3345,9 @@ void SJISFont::setColorMap(const uint8 *src) {
 
 	if (!_is16Color) {
 		if (_colorMap[0] == _invisColor)
-			_font->setShadowMode(Graphics::FontSJIS::kShadowTypeNone);
+			_font->setDrawingMode(Graphics::FontSJIS::kDefaultMode);
 		else
-			_font->setShadowMode(Graphics::FontSJIS::kShadowTypeOutline);
+			_font->setDrawingMode(Graphics::FontSJIS::kOutlineMode);
 	}
 }
 
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index c77c77857a..207aa2c754 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -666,15 +666,16 @@ void CharsetRendererCommon::enableShadow(bool enable) {
 			_shadowColor = _vm->_game.version == 5 ? _vm->_townsCharsetColorMap[0] : 0x88;
 			if (_vm->_cjkFont) {
 				if (_vm->_game.version == 5) {
-					if (_vm->_game.id == GID_MONKEY) {
-						_vm->_cjkFont->setShadowMode((_curId == 2 || _curId == 4 || _curId == 6) ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone);
-					} else if (_vm->_game.id == GID_MONKEY2) {
-						_vm->_cjkFont->setShadowMode((_curId != 1 && _curId != 5 && _curId != 9) ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone);
-					} else if (_vm->_game.id == GID_INDY4) {
-						_vm->_cjkFont->setShadowMode((_curId == 2 || _curId == 3 || _curId == 4) ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone);
-					}					
+					if (((_vm->_game.id == GID_MONKEY) && (_curId == 2 || _curId == 4 || _curId == 6)) ||
+						((_vm->_game.id == GID_MONKEY2) && (_curId != 1 && _curId != 5 && _curId != 9)) ||
+						((_vm->_game.id == GID_INDY4) && (_curId == 2 || _curId == 3 || _curId == 4))) {
+							_vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kOutlineMode);
+					} else {
+						_vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kDefaultMode);
+					}
+					_vm->_cjkFont->toggleFlippedMode((_vm->_game.id == GID_MONKEY || _vm->_game.id == GID_MONKEY2) && _curId == 3);
 				} else {
-					_vm->_cjkFont->setShadowMode(Graphics::FontSJIS::kShadowTypeScumm3Towns);
+					_vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kShadowMode);
 				}
 			}
 #endif
@@ -685,7 +686,7 @@ void CharsetRendererCommon::enableShadow(bool enable) {
 		}
 	} else {
 		if (_vm->_cjkFont)
-			_vm->_cjkFont->setShadowMode(Graphics::FontSJIS::kShadowTypeNone);
+			_vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kDefaultMode);
 		_shadowMode = kNoShadowMode;
 	}
 }
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 97375c884b..b9d0d8332f 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -65,9 +65,9 @@ void FontSJISBase::blitCharacter(const uint8 *glyph, const int w, const int h, u
 
 			if (mask & 0x80) {
 				*d = c1;
-				if (_shadowType == kShadowTypeScumm3 ||	_shadowType == kShadowTypeScumm3Towns)
+				if (_drawMode == kShadowMode ||	_drawMode == kFMTownsShadowMode)
 					d[1] = d[pitch] = c2;
-				if (_shadowType == kShadowTypeScumm3)
+				if (_drawMode == kShadowMode)
 					d[pitch + 1] = c2;
 			}
 			++d;
@@ -108,6 +108,36 @@ void FontSJISBase::createOutline(uint8 *outline, const uint8 *glyph, const int w
 	}
 }
 
+#ifndef DISABLE_FLIPPED_MODE
+const uint8 *FontSJISBase::flipCharacter(const uint8 *glyph, const int w) const {
+	static const uint8 flipData[] = {
+		0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+		0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+		0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+		0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+		0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+		0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+		0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+		0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+		0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+		0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+		0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+		0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+		0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+		0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+		0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+		0x0F, 0x8F, 0x4F, 0xC7, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x97, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+	};
+
+	for (int i = 0; i < w; i++) {
+		_tempGlyph[i] = flipData[glyph[(w * 2 - 1) - i]];
+		_tempGlyph[(w * 2 - 1) - i] = flipData[glyph[i]];
+	}
+
+	return _tempGlyph;
+}
+#endif
+
 void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, uint32 c2) const {
 	const uint8 *glyphSource = 0;
 	int width = 0, height = 0;
@@ -126,21 +156,26 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
 		return;
 	}
 
+#ifndef DISABLE_FLIPPED_MODE
+	if (_flippedMode)
+		glyphSource = flipCharacter(glyphSource, width);
+#endif
+
 	uint8 outline[18 * 18];
-	if (_shadowType == kShadowTypeOutline) {
+	if (_drawMode == kOutlineMode) {
 		memset(outline, 0, sizeof(outline));
 		createOutline(outline, glyphSource, width, height);
 	}
 
 	if (bpp == 1) {
-		if (_shadowType == kShadowTypeOutline) {
+		if (_drawMode == kOutlineMode) {
 			blitCharacter<uint8>(outline, width + 2, height + 2, (uint8 *)dst, pitch, c2);
 			blitCharacter<uint8>(glyphSource, width, height, (uint8 *)dst + pitch + 1, pitch, c1);
 		} else {
 			blitCharacter<uint8>(glyphSource, width, height, (uint8 *)dst, pitch, c1, c2);
 		}
 	} else if (bpp == 2) {
-		if (_shadowType == kShadowTypeOutline) {
+		if (_drawMode == kOutlineMode) {
 			blitCharacter<uint16>(outline, width + 2, height + 2, (uint8 *)dst, pitch, c2);
 			blitCharacter<uint16>(glyphSource, width, height, (uint8 *)dst + pitch + 2, pitch, c1);
 		} else {
@@ -153,7 +188,7 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
 
 uint FontSJISBase::getCharWidth(uint16 ch) const {
 	if (is8x16(ch))
-		return (_shadowType == kShadowTypeOutline) ? 10 : (_shadowType == kShadowTypeNone ? 8 : 9);
+		return (_drawMode == kOutlineMode) ? 10 : (_drawMode == kDefaultMode ? 8 : 9);
 	else
 		return getMaxFontWidth();
 }
diff --git a/graphics/sjis.h b/graphics/sjis.h
index 7cdcbb785b..4ade2f5278 100644
--- a/graphics/sjis.h
+++ b/graphics/sjis.h
@@ -37,6 +37,14 @@
 #ifndef GRAPHICS_SJIS_H
 #define GRAPHICS_SJIS_H
 
+#ifdef __DS__
+/* This disables the flipped mode which is used in FM-Towns versions
+ * of Monkey Island 1 (and maybe other SCUMM 5 games). These are not supported
+ * on the DS, so it makes sense to have a corresponding setting here.
+ */
+#define DISABLE_FLIPPED_MODE
+#endif
+
 #include "common/scummsys.h"
 #include "common/stream.h"
 #include "common/util.h"
@@ -71,19 +79,24 @@ public:
 	virtual bool loadData() = 0;
 
 	/**
-	 * Enable outline/shadow drawing.
+	 * Enable drawing with outline or shadow.
 	 *
 	 * After changing outline state, getFontHeight and getMaxFontWidth / getCharWidth might return
 	 * different values!
 	 */
-	enum ShadowType {
-		kShadowTypeNone,
-		kShadowTypeOutline,
-		kShadowTypeScumm3,
-		kShadowTypeScumm3Towns
+	enum DrawingMode {
+		kDefaultMode,
+		kOutlineMode,
+		kShadowMode,
+		kFMTownsShadowMode
 	};
 
-	virtual void setShadowMode(ShadowType type) {}
+	virtual void setDrawingMode(DrawingMode mode) {}
+
+	/**
+	 * Enable flipped character drawing (e.g. in the MI1 circus scene after Guybrush gets shot out of the cannon).
+	 */
+	virtual void toggleFlippedMode(bool enable) {}
 
 	/**
 	 * Returns the height of the font.
@@ -129,13 +142,15 @@ public:
  */
 class FontSJISBase : public FontSJIS {
 public:
-	FontSJISBase() : _shadowType(kShadowTypeNone) {}
+	FontSJISBase() : _drawMode(kDefaultMode), _flippedMode(false) {}
+
+	void setDrawingMode(DrawingMode mode) { _drawMode = mode; }
 
-	void setShadowMode(ShadowType type) { _shadowType = type; }
+	void toggleFlippedMode(bool enable) { _flippedMode = enable; }
 
-	uint getFontHeight() const { return (_shadowType == kShadowTypeOutline) ? 18 : (_shadowType == kShadowTypeNone ? 16 : 17); }
+	uint getFontHeight() const { return (_drawMode == kOutlineMode) ? 18 : (_drawMode == kDefaultMode ? 16 : 17); }
 	
-	uint getMaxFontWidth() const { return (_shadowType == kShadowTypeOutline) ? 18 : (_shadowType == kShadowTypeNone ? 16 : 17); }
+	uint getMaxFontWidth() const { return (_drawMode == kOutlineMode) ? 18 : (_drawMode == kDefaultMode ? 16 : 17); }
 
 	uint getCharWidth(uint16 ch) const;
 
@@ -144,8 +159,16 @@ private:
 	template<typename Color>
 	void blitCharacter(const uint8 *glyph, const int w, const int h, uint8 *dst, int pitch, Color c1, Color c2 = 0) const;
 	void createOutline(uint8 *outline, const uint8 *glyph, const int w, const int h) const;
+
+#ifndef DISABLE_FLIPPED_MODE
+	// This is used in the FM-Towns version of Monkey Island 1
+	// when Guybrush gets shot out of the cannon in the circus tent.
+	const uint8 *flipCharacter(const uint8 *glyph, const int w) const;
+	mutable uint8 _tempGlyph[32];
+#endif
 protected:
-	ShadowType _shadowType;
+	DrawingMode _drawMode;
+	bool _flippedMode;
 
 	bool is8x16(uint16 ch) const;