[Scummvm-git-logs] scummvm master -> 6fac0ace2c844aa68c2482362021981ed1db931b

[sev-]

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

Summary:
bca79db96b WAGE: Set default values for DITL messages
82a3088557 WAGE: The command is "inven"
6fac0ace2c WAGE: Fix crash on sound reuse/game quit


Commit: bca79db96b8964e232e136ca5c45f11c958226d1
    https://github.com/scummvm/scummvm/commit/bca79db96b8964e232e136ca5c45f11c958226d1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-08T23:45:26+02:00

Commit Message:
WAGE: Set default values for DITL messages

Changed paths:
    engines/wage/gui.cpp
    engines/wage/wage.cpp
    engines/wage/world.cpp


diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index fb46ec1..3159d80 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -250,6 +250,7 @@ void Gui::executeMenuCommand(int action, Common::String &text) {
 	case kMenuActionClose:
 	case kMenuActionRevert:
 	case kMenuActionQuit:
+		warning("STUB: executeMenuCommand: action: %d", action);
 		break;
 
 	case kMenuActionOpen:
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index 6d153a3..923964b 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -238,7 +238,7 @@ bool WageEngine::saveDialog() {
 	buttons.push_back(new DialogButton("Yes", 112, 67, 68, 28));
 	buttons.push_back(new DialogButton("Cancel", 205, 67, 68, 28));
 
-	Dialog save(_gui, 291, "Save changes before closing?", &buttons, 1);
+	Dialog save(_gui, 291, _world->_saveBeforeCloseMessage->c_str(), &buttons, 1);
 
 	int button = save.run();
 
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 465240a..4e92af2 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -174,21 +174,29 @@ bool World::loadWorld(Common::MacResManager *resMan) {
 		message->trim();
 		debug(2, "_gameOverMessage: %s", message->c_str());
 		_gameOverMessage = message;
+	} else {
+		_gameOverMessage = new Common::String("Game Over!");
 	}
 	if ((message = loadStringFromDITL(resMan, 2480, 3)) != NULL) {
 		message->trim();
 		debug(2, "_saveBeforeQuitMessage: %s", message->c_str());
 		_saveBeforeQuitMessage = message;
+	} else {
+		_saveBeforeQuitMessage = new Common::String("Save changes before quiting?");
 	}
 	if ((message = loadStringFromDITL(resMan, 2490, 3)) != NULL) {
 		message->trim();
 		debug(2, "_saveBeforeCloseMessage: %s", message->c_str());
 		_saveBeforeCloseMessage = message;
+	} else {
+		_saveBeforeCloseMessage = new Common::String("Save changes before closing?");
 	}
 	if ((message = loadStringFromDITL(resMan, 2940, 2)) != NULL) {
 		message->trim();
 		debug(2, "_revertMessage: %s", message->c_str());
 		_revertMessage = message;
+	} else {
+		_revertMessage = new Common::String("Revert to the last saved version?");
 	}
 
 	// Load scenes


Commit: 82a308855756f4407d35d57088bb65f0b05093a2
    https://github.com/scummvm/scummvm/commit/82a308855756f4407d35d57088bb65f0b05093a2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-08T23:45:26+02:00

Commit Message:
WAGE: The command is "inven"

Changed paths:
    engines/wage/script.cpp


diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index 782d9ee..1773fc1 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -219,7 +219,7 @@ bool Script::execute(World *world, int loopCount, Common::String *inputText, Des
 			_handled = _engine->handleOfferCommand(&input.c_str()[6]);
 		} else if (input.contains("look")) {
 			_handled = _engine->handleLookCommand();
-		} else if (input.contains("inventory")) {
+		} else if (input.contains("inven")) {
 			_handled = _engine->handleInventoryCommand();
 		} else if (input.contains("status")) {
 			_handled = _engine->handleStatusCommand();


Commit: 6fac0ace2c844aa68c2482362021981ed1db931b
    https://github.com/scummvm/scummvm/commit/6fac0ace2c844aa68c2482362021981ed1db931b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-08T23:45:26+02:00

Commit Message:
WAGE: Fix crash on sound reuse/game quit

Changed paths:
    engines/wage/sound.cpp


diff --git a/engines/wage/sound.cpp b/engines/wage/sound.cpp
index d24e51a..dcc33a2 100644
--- a/engines/wage/sound.cpp
+++ b/engines/wage/sound.cpp
@@ -91,7 +91,8 @@ void WageEngine::playSound(Common::String soundName) {
 
 	Audio::AudioStream *stream = Audio::makeRawStream(s->_data, s->_size, 11000, Audio::FLAG_UNSIGNED);
 
-	_mixer->playStream(Audio::Mixer::kPlainSoundType, &s->_handle, stream);
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &s->_handle, stream,
+		-1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
 }
 
 void WageEngine::updateSoundTimerForScene(Scene *scene, bool firstTime) {