4 files changed, 6 insertions, 4 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index eaf1dfe9a8..624a4b0e67 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -237,6 +237,8 @@ void CGameObject::loadResource(const CString &name) {
 	case FILETYPE_MOVIE:
 		loadMovie(name);
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 85bac6a63e..51631a3e1b 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -495,7 +495,7 @@ void CPetControl::summonNPC(const CString &name, int val) {
 
 void CPetControl::startPetTimer(uint timerIndex, uint firstDuration, uint duration, void *target) {
 	stopPetTimer(timerIndex);
-	_timers[timerIndex]._id = (timerIndex, firstDuration, duration);
+	_timers[timerIndex]._id = addTimer(timerIndex, firstDuration, duration);
 	_timers[timerIndex]._target = target;
 	setTimer44(_timers[timerIndex]._id, 0);
 }
diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp
index f4466def31..07e4c28991 100644
--- a/engines/titanic/support/font.cpp
+++ b/engines/titanic/support/font.cpp
@@ -112,7 +112,7 @@ int STFont::stringWidth(const CString &text) const {
 	const char *srcP = text.c_str();
 	int total = 0;
 	char c;
-	while (c = (*srcP++)) {
+	while ((c = *srcP++)) {
 		if (c == 26) {
 			// Skip over command parameter bytes
 			srcP += 3;
@@ -120,7 +120,7 @@ int STFont::stringWidth(const CString &text) const {
 			// Skip over command parameter bytes
 			srcP += 4;
 		} else if (c != '\n') {
-			total += _chars[c]._width;
+			total += _chars[(byte)c]._width;
 		}
 	}
 
diff --git a/engines/titanic/true_talk/tt_npc_script.h b/engines/titanic/true_talk/tt_npc_script.h
index 15ff5303b7..7362d4db87 100644
--- a/engines/titanic/true_talk/tt_npc_script.h
+++ b/engines/titanic/true_talk/tt_npc_script.h
@@ -210,7 +210,7 @@ public:
 	 * Sets the value for an NPC's dial
 	 */
 	virtual void setDial(int dialNum, int value);
-	
+
 	/**
 	 * Returns a dial's region number
 	 */