[Scummvm-cvs-logs] scummvm master -> 1c17b277eb930f89ef034ce4973c9fbf809d18f4

[bluegr]

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:
1c17b277eb DREAMWEB: Mark all of the differences between the floppy and CD versions


Commit: 1c17b277eb930f89ef034ce4973c9fbf809d18f4
    https://github.com/scummvm/scummvm/commit/1c17b277eb930f89ef034ce4973c9fbf809d18f4
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-28T06:16:41-08:00

Commit Message:
DREAMWEB: Mark all of the differences between the floppy and CD versions

- Add TODOs for the CD checks in setupTimedTemp() and startTalk()
- The current doSomeTalk() is for the CD version only
- Implement a difference of the CD version in intro

Changed paths:
    engines/dreamweb/stubs.cpp
    engines/dreamweb/talk.cpp
    engines/dreamweb/titles.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6067b20..f009bd5 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -935,7 +935,7 @@ void DreamWebEngine::useTimedText() {
 }
 
 void DreamWebEngine::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
-#if 1 // if cd
+#if 1	// if cd - TODO: replace with a proper CD check
 	if (voiceIndex != 0) {
 		if (loadSpeech('T', voiceIndex, 'T', textIndex)) {
 			playChannel1(50+12);
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 2ff2aa7..56826e7 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -98,6 +98,7 @@ void DreamWebEngine::startTalk() {
 	y = 80;
 	printDirect(&str, 66, &y, 241, true);
 
+#if 1	// if cd - TODO: replace with a proper CD check
 	_speechLoaded = false;
 	loadSpeech('R', _realLocation, 'C', 64*(_character & 0x7F));
 	if (_speechLoaded) {
@@ -105,6 +106,7 @@ void DreamWebEngine::startTalk() {
 		_volumeTo = 6;
 		playChannel1(50 + 12);
 	}
+#endif
 }
 
 const uint8 *DreamWebEngine::getPersonText(uint8 index, uint8 talkPos) {
@@ -137,6 +139,8 @@ void DreamWebEngine::moreTalk() {
 }
 
 void DreamWebEngine::doSomeTalk() {
+	// FIXME: This is for the CD version only
+
 	while (true) {
 		const uint8 *str = getPersonText(_character & 0x7F, _talkPos);
 
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 3b78347..7d32992 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -141,7 +141,7 @@ void DreamWebEngine::intro() {
 	loadIntroRoom();
 	_volume = 7;
 	_volumeDirection = -1;
-	_volumeTo = 4;
+	_volumeTo = isCD() ? 4 : 0;
 	playChannel0(12, 255);
 	fadeScreenUps();
 	runIntroSeq();