[Scummvm-git-logs] scummvm master -> 2e2e0df346eb668aba5f7a3376a20c4619984fed

dreammaster dreammaster at scummvm.org
Sun Oct 30 02:25:18 CET 2016


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:
2e2e0df346 TITANIC: Return proper handle from CGameObject::playSound


Commit: 2e2e0df346eb668aba5f7a3376a20c4619984fed
    https://github.com/scummvm/scummvm/commit/2e2e0df346eb668aba5f7a3376a20c4619984fed
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-29T21:25:10-04:00

Commit Message:
TITANIC: Return proper handle from CGameObject::playSound

Changed paths:
    engines/titanic/core/game_object.cpp



diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 92c7e94..76a6274 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -758,7 +758,7 @@ int CGameObject::playSound(const CString &name, CProximity &prox) {
 	if (gameManager && !name.empty()) {
 		g_vm->_filesManager->preload(name);
 
-		gameManager->_sound.playSound(name, prox);
+		return gameManager->_sound.playSound(name, prox);
 	}
 
 	return -1;





More information about the Scummvm-git-logs mailing list