From 4d4dd4fe024d7ad9d6974e4438febf87ae32750a Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 29 Aug 2004 01:24:17 +0000
Subject: Add some charset codes for HE 7.2 gasmes Later HE 7.2 games use hard
 coded sound rate for speech (Rate never changes anyway)

svn-id: r14822
---
 scumm/sound.cpp  |  9 +++------
 scumm/string.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 127e5be5d2..f71866019f 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -651,16 +651,13 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle
 		if (_vm->_features & GF_HUMONGOUS) {
 			_sfxMode |= mode;
 
-			// SKIP TALK (8) HSHD (14)
-			_sfxFile->seek(offset + 22, SEEK_SET);
-			int rate = _sfxFile->readUint16LE();
-			// SKIP HSHD (8) and SDAT (8)
-			_sfxFile->seek(+16, SEEK_CUR);
+			// SKIP TALK (8) HSHD (22) and SDAT (8)
+			_sfxFile->seek(offset + 40, SEEK_SET);
 
 			size = b - 40;
 			sound = (byte *)malloc(size);
 			_sfxFile->read(sound, size);
-			_vm->_mixer->playRaw(handle, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+			_vm->_mixer->playRaw(handle, sound, size, 11000, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 			return;
 		}
 
diff --git a/scumm/string.cpp b/scumm/string.cpp
index b561363460..96311238ad 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -82,6 +82,8 @@ void ScummEngine::CHARSET_1() {
 	int frme;
 	Actor *a;
 	byte *buffer;
+	int code = (_gameId == GID_PAJAMA) ? 127 : 64;
+	char value[32];
 
 	if (!_haveMsg)
 		return;
@@ -177,11 +179,6 @@ void ScummEngine::CHARSET_1() {
 
 	buffer = _charsetBuffer + _charsetBufPos;
 
-	// TODO HE 7.2 games use difference charset codes
-	// Skip the code for now
-	if (_heversion >= 72)
-		buffer += 15;
-
 	if (_version > 3)
 		_charset->addLinebreaks(0, buffer, 0, t);
 
@@ -224,7 +221,49 @@ void ScummEngine::CHARSET_1() {
 			continue;
 		}
 
-		if (c == 0xFE || c == 0xFF) {
+		if (_heversion >= 72 && c == code) {
+			c = *buffer++;
+			switch(c) {
+			case 84:
+				i = 0;
+				memset(value, 0, 32);
+				c = *buffer++;
+				while(c != 44) {
+					value[i] = c;
+					c = *buffer++;
+					i++;
+				}
+				value[i] = 0;
+				talk_sound_a = atoi(value);
+
+				i = 0;
+				memset(value, 0, 32);
+				c = *buffer++;
+				while(c != code) {
+					value[i] = c;
+					c = *buffer++;
+					i++;
+				}
+				value[i] = 0;
+				talk_sound_b = atoi(value);
+
+				_sound->talkSound(talk_sound_a, talk_sound_b, 2);
+				break;
+			case 110:
+				goto newLine;
+			case 104:
+				_haveMsg = 0;
+				_keepText = true;
+				break;
+			case 119:
+				if (_haveMsg != 0xFE)
+					_haveMsg = 0xFF;
+				_keepText = false;
+				break;
+			default:
+				warning("CHARSET_1: invalid code %d", c);
+			}
+		} else if (c == 0xFE || c == 0xFF) {
 			c = *buffer++;
 			switch(c) {
 			case 1:
-- 
cgit v1.2.3