aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-05-04 20:30:52 -0400
committerPaul Gilbert2016-07-10 16:38:19 -0400
commitb79ed60a8eca775613ec0b36d345dd8fcb4e5f08 (patch)
tree9f53258bb5aeae1a1daf030202c259b4b745c8c7 /engines/titanic/core
parent4963c9f50b53cbd663c18387d8606ad4623cca34 (diff)
downloadscummvm-rg350-b79ed60a8eca775613ec0b36d345dd8fcb4e5f08.tar.gz
scummvm-rg350-b79ed60a8eca775613ec0b36d345dd8fcb4e5f08.tar.bz2
scummvm-rg350-b79ed60a8eca775613ec0b36d345dd8fcb4e5f08.zip
TITANIC: Added loadSound, support methods, and CSoundItem class
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp13
-rw-r--r--engines/titanic/core/game_object.h5
2 files changed, 16 insertions, 2 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index e6b51f7c12..d1991a4baa 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -239,7 +239,7 @@ void CGameObject::loadResource(const CString &name) {
}
void CGameObject::loadMovie(const CString &name, bool pendingFlag) {
- g_vm->_filesManager.fn5(name);
+ g_vm->_filesManager.preload(name);
// Create the surface if it doesn't already exist
if (!_surface) {
@@ -272,7 +272,7 @@ void CGameObject::loadImage(const CString &name, bool pendingFlag) {
_surface = nullptr;
}
- g_vm->_filesManager.fn5(name);
+ g_vm->_filesManager.preload(name);
if (!name.empty()) {
_surface = new OSVideoSurface(screenManager, CResourceKey(name), pendingFlag);
@@ -749,4 +749,13 @@ void CGameObject::checkPlayMovie(const CString &name, int flags) {
}
}
+void CGameObject::loadSound(const CString &name) {
+ CGameManager *gameManager = getGameManager();
+ if (gameManager) {
+ g_vm->_filesManager.preload(name);
+ if (!name.empty())
+ gameManager->_sound.loadSound(name);
+ }
+}
+
} // End of namespace Titanic
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 7c40c5f027..5bcba778f4 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -220,6 +220,11 @@ protected:
* Support function for drag moving
*/
void dragMove(const Point &pt);
+
+ /**
+ * Load a sound
+ */
+ void loadSound(const CString &name);
public:
int _field60;
CursorId _cursorId;