[Scummvm-git-logs] scummvm master -> 05e9f5cce6e097bd23b5a6e4474fb1c527b592c2

[athrxx]

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

Summary:
53122846e1 KYRA: remove some unnecessary lines
05e9f5cce6 KYRA: (LOL/PC-98) - fix text displayer glitch


Commit: 53122846e1bd78f14d125eafe117c77a89b5385a
    https://github.com/scummvm/scummvm/commit/53122846e1bd78f14d125eafe117c77a89b5385a
Author: athrxx (athrxx at scummvm.org)
Date: 2018-12-25T21:31:45+01:00

Commit Message:
KYRA: remove some unnecessary lines

Changed paths:
    engines/kyra/sound_towns.cpp


diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index e1c9bc5..94bfbcf 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -236,7 +236,6 @@ void SoundTowns::updateVolumeSettings() {
 		return;
 
 	bool mute = false;
-	_player->driver()->setSoundEffectVolume(ConfMan.getInt("sfx_volume"));
 	if (ConfMan.hasKey("mute"))
 		mute = ConfMan.getBool("mute");
 
@@ -505,7 +504,6 @@ void SoundPC98::updateVolumeSettings() {
 		return;
 
 	bool mute = false;
-	_driver->setSoundEffectVolume(ConfMan.getInt("sfx_volume"));
 	if (ConfMan.hasKey("mute"))
 		mute = ConfMan.getBool("mute");
 
@@ -739,7 +737,6 @@ void SoundTownsPC98_v2::updateVolumeSettings() {
 		return;
 
 	bool mute = false;
-	_driver->setSoundEffectVolume(ConfMan.getInt("sfx_volume"));
 	if (ConfMan.hasKey("mute"))
 		mute = ConfMan.getBool("mute");
 


Commit: 05e9f5cce6e097bd23b5a6e4474fb1c527b592c2
    https://github.com/scummvm/scummvm/commit/05e9f5cce6e097bd23b5a6e4474fb1c527b592c2
Author: athrxx (athrxx at scummvm.org)
Date: 2018-12-25T21:31:45+01:00

Commit Message:
KYRA: (LOL/PC-98) - fix text displayer glitch

Changed paths:
    engines/kyra/text_rpg.cpp


diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index 3020a63..1280d8c 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -327,7 +327,7 @@ void TextDisplayer_rpg::printLine(char *str) {
 	if (sjisTextMode) {
 		bool ct = true;
 
-		if ((lw + _textDimData[sdx].column) > w) {
+		if ((lw + _textDimData[sdx].column) >= w) {
 			if ((lines - 1 - (_waitButtonSpace << 1)) <= _lineCount)
 				// cut off line to leave space for "MORE" button
 				w -= _vm->guiSettings()->buttons.waitReserve;