TITANIC: Start of music player class

3 files changed, 5 insertions, 3 deletions

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 89e3ded248..897eab88f4 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -460,7 +460,7 @@ void CGameObject::playGlobalSound(const CString &resName, int mode, bool initial
 	uint volume = initialMute ? 0 : newVolume;
 
 	CProximity prox;
-	prox._channelVolume = newVolume;
+	prox._channelVolume = volume;
 	prox._repeated = repeated;
 
 	switch (handleIndex) {
@@ -1397,6 +1397,8 @@ int CGameObject::getNewRandomNumber(int max, int *oldVal) {
 		int startingVal = *oldVal;
 		while (*oldVal == startingVal && max > 0)
 			*oldVal = g_vm->getRandomNumber(max);
+
+		return *oldVal;
 	} else {
 		return g_vm->getRandomNumber(max);
 	}
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 665fc6cf37..e446cc3251 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -250,7 +250,7 @@ protected:
 	/**
 	 * Adds a timer
 	 */
-	int addTimer(uint firstDuration, uint repeatDuration);
+	int addTimer(uint firstDuration, uint repeatDuration = 0);
 
 	/**
 	 * Stops a timer
diff --git a/engines/titanic/core/view_item.h b/engines/titanic/core/view_item.h
index d653c3a4f3..ceb8a020da 100644
--- a/engines/titanic/core/view_item.h
+++ b/engines/titanic/core/view_item.h
@@ -56,10 +56,10 @@ private:
 protected:
 	int _field24;
 	CResourceKey _resourceKey;
-	double _angle;
 	Point _viewPos;
 public:
 	int _viewNumber;
+	double _angle;
 public:
 	CLASSDEF;
 	CViewItem();