[Scummvm-git-logs] scummvm master -> 87ca13c331fe627571f1f9a37c7a7e4d43998bf8

Tue May 19 14:22:28 UTC 2020

This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a933b0a83e SAGA: (ITE/PC98) - fix music fading
9148e8822d SAGA: (ITE/PC98) - fix voices in second intro part
386aad2196 SAGA: (ITE/PC98) - fix opening credits
d2aa06eef5 SAGA: (ITE/PC98) - fix opening credits style/color
87ca13c331 SAGA: (ITE/PC98) - add missing comma


Commit: a933b0a83eee2716d9b00990ce5edcbb891d7561
    https://github.com/scummvm/scummvm/commit/a933b0a83eee2716d9b00990ce5edcbb891d7561
Author: athrxx (athrxx at scummvm.org)
Date: 2020-05-19T16:18:26+02:00

Commit Message:
SAGA: (ITE/PC98) - fix music fading

Changed paths:
    engines/saga/music.cpp

diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 88473e9094..a384e59ffc 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -253,7 +253,10 @@ void Music::musicVolumeGauge() {
 		volume = 1;
 
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
-	_player->setVolume(volume);
+	if (_player)
+		_player->setVolume(volume);
+	if (_playerPC98)
+		_playerPC98->setMusicVolume(volume);
 
 	if (_currentVolumePercent == 100) {
 		_vm->getTimerManager()->removeTimerProc(&musicVolumeGaugeCallback);


Commit: 9148e8822daab014b0b10b7846f1d66a835f167a
    https://github.com/scummvm/scummvm/commit/9148e8822daab014b0b10b7846f1d66a835f167a
Author: athrxx (athrxx at scummvm.org)
Date: 2020-05-19T16:18:30+02:00

Commit Message:
SAGA: (ITE/PC98) - fix voices in second intro part

Changed paths:
    engines/saga/script.cpp


diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp
index df167d5744..8ad6e1484f 100644
--- a/engines/saga/script.cpp
+++ b/engines/saga/script.cpp
@@ -979,10 +979,11 @@ void Script::opSpeak(SCRIPTOP_PARAMS) {
 
 	// now data contains last string index
 
-	if (_vm->getFeatures() & GF_ITE_DOS_DEMO) {
+	if (_vm->getFeatures() & GF_ITE_DOS_DEMO || _vm->getPlatform() == Common::kPlatformPC98) {
+		int offset = (_vm->getPlatform() == Common::kPlatformPC98) ? 295 : 288;
 		if ((_vm->_scene->currentSceneNumber() == ITE_DEFAULT_SCENE) &&
-			(iparam1 >= 288) && (iparam1 <= (RID_SCENE1_VOICE_END - RID_SCENE1_VOICE_START + 288))) {
-			sampleResourceId = RID_SCENE1_VOICE_START + iparam1 - 288;
+			(iparam1 >= offset) && (iparam1 <= (RID_SCENE1_VOICE_END - RID_SCENE1_VOICE_START + offset))) {
+			sampleResourceId = RID_SCENE1_VOICE_START + iparam1 - offset;
 		}
 	} else {
 		if (thread->_voiceLUT->size() > uint16(first))


Commit: 386aad21962206740b3ad8d5ac303b0423073135
    https://github.com/scummvm/scummvm/commit/386aad21962206740b3ad8d5ac303b0423073135
Author: athrxx (athrxx at scummvm.org)
Date: 2020-05-19T16:18:34+02:00

Commit Message:
SAGA: (ITE/PC98) - fix opening credits

Changed paths:
    engines/saga/introproc_ite.cpp
    engines/saga/itedata.cpp
    engines/saga/itedata.h


diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index aed35177c8..557b57cb29 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -728,12 +728,17 @@ int Scene::ITEIntroFaireTentProc(int param) {
 		event.time = 0;
 		event.duration = DISSOLVE_DURATION;
 		eventColumns = _vm->_events->queue(event);
+		_vm->_events->chain(eventColumns, event);
+
+		// Queue PC98 extra credits
+		if (_vm->getPlatform() == Common::kPlatformPC98)
+			eventColumns = queueCredits(DISSOLVE_DURATION, CREDIT_DURATION1, ARRAYSIZE(creditsTent), creditsTent);
 
 		// End scene after momentary pause
 		event.type = kEvTOneshot;
 		event.code = kSceneEvent;
 		event.op = kEventEnd;
-		event.time = 5000;
+		event.time = (_vm->getPlatform() == Common::kPlatformPC98) ? 5000 - CREDIT_DURATION1 : 5000;
 		_vm->_events->chain(eventColumns, event);
 
 		break;
diff --git a/engines/saga/itedata.cpp b/engines/saga/itedata.cpp
index 932572ad1b..78a95cf84f 100644
--- a/engines/saga/itedata.cpp
+++ b/engines/saga/itedata.cpp
@@ -1257,7 +1257,10 @@ const IntroCredit creditsFairePath2[] = {
 	{Common::JA_JPN, kITECreditsAny, kITECreditsHeader, "Directed by"},
 	{Common::UNK_LANG, kITECreditsAny, kITECreditsText, "Talin"},
 	{Common::FR_FRA, kITECreditsAny, kITECreditsHeader, "Traduction Francaise"},
-	{Common::FR_FRA, kITECreditsAny, kITECreditsText, "Ryfatwork, Momo le Yetty et Darknior"},
+	{Common::FR_FRA, kITECreditsAny, kITECreditsText, "Ryfatwork, Momo le Yetty et Darknior"}
+};
+
+const IntroCredit creditsTent[6] = {
 	{Common::JA_JPN, kITECreditsAny, kITECreditsHeader, "NEC PC-9821 version by"},
 	{Common::JA_JPN, kITECreditsAny, kITECreditsText, "STARCRAFT,Inc."},
 	{Common::JA_JPN, kITECreditsAny, kITECreditsHeader, "Programming"},
diff --git a/engines/saga/itedata.h b/engines/saga/itedata.h
index e58882328c..23fac1575c 100644
--- a/engines/saga/itedata.h
+++ b/engines/saga/itedata.h
@@ -141,7 +141,8 @@ extern const IntroCredit creditsValley[19];
 extern const IntroCredit creditsTreeHouse1[20];
 extern const IntroCredit creditsTreeHouse2[27];
 extern const IntroCredit creditsFairePath1[23];
-extern const IntroCredit creditsFairePath2[14];
+extern const IntroCredit creditsFairePath2[8];
+extern const IntroCredit creditsTent[6];
 
 } // End of namespace Saga
 


Commit: d2aa06eef57afa12630361c14253b4a887825dd5
    https://github.com/scummvm/scummvm/commit/d2aa06eef57afa12630361c14253b4a887825dd5
Author: athrxx (athrxx at scummvm.org)
Date: 2020-05-19T16:18:38+02:00

Commit Message:
SAGA: (ITE/PC98) - fix opening credits style/color

Changed paths:
    engines/saga/introproc_ite.cpp


diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 557b57cb29..41e6ae1bda 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -247,9 +247,9 @@ EventColumns *Scene::queueCredits(int delta_time, int duration, int n_credits, c
 	Event event;
 	EventColumns *eventColumns = NULL;
 
-	textEntry.knownColor = kKnownColorSubtitleTextColor;
-	textEntry.effectKnownColor = kKnownColorTransparent;
-	textEntry.flags = (FontEffectFlags)(kFontOutline | kFontCentered);
+	textEntry.knownColor = (_vm->getPlatform() == Common::kPlatformPC98) ? kKnownColorBrightWhite : kKnownColorSubtitleTextColor;
+	textEntry.effectKnownColor = (_vm->getPlatform() == Common::kPlatformPC98) ? kKnownColorVerbTextShadow : kKnownColorTransparent;
+	textEntry.flags = (FontEffectFlags)(((_vm->getPlatform() == Common::kPlatformPC98) ? kFontShadow : kFontOutline) | kFontCentered);
 	textEntry.point.x = 160;
 
 	for (i = 0; i < n_credits; i++) {


Commit: 87ca13c331fe627571f1f9a37c7a7e4d43998bf8
    https://github.com/scummvm/scummvm/commit/87ca13c331fe627571f1f9a37c7a7e4d43998bf8
Author: athrxx (athrxx at scummvm.org)
Date: 2020-05-19T16:18:42+02:00

Commit Message:
SAGA: (ITE/PC98) - add missing comma

Changed paths:
    engines/saga/itedata.cpp


diff --git a/engines/saga/itedata.cpp b/engines/saga/itedata.cpp
index 78a95cf84f..5a7511be1d 100644
--- a/engines/saga/itedata.cpp
+++ b/engines/saga/itedata.cpp
@@ -471,7 +471,7 @@ const char *ITEinterfaceTextStrings[][53] = {
 	// Japanese
 	{
 		// "æ©ã€€ã", "è¦‹ã€€ã‚‹", "æ‹¾ã€€ã†", "è©±ã€€ã™", "é–‹ã‘ã‚‹",
-		"\x95\xE0\x81@\x82\xAD", "\x8C\xA9\x81@\x82\xE9", "\x8F\x45\x81@\x82\xA4", "\x98\x62\x81@\x82\xB7", "\x8AJ\x82\xAF\x82\xE9"
+		"\x95\xE0\x81@\x82\xAD", "\x8C\xA9\x81@\x82\xE9", "\x8F\x45\x81@\x82\xA4", "\x98\x62\x81@\x82\xB7", "\x8AJ\x82\xAF\x82\xE9",
 		// "é–‰ã‚ã‚‹", "ä½¿ã€€ã†", "ä¸Žãˆã‚‹", "Options", "Test",
 		"\x95\xC2\x82\xDF\x82\xE9", "\x8Eg\x81@\x82\xA4", "\x97^\x82\xA6\x82\xE9", "Options", "Test",
 		// "Demo", "Help", "ã‚²ãƒ¼ãƒ çµ‚äº†", "é€Ÿã„", "é…ã„",


