[Scummvm-cvs-logs] scummvm master -> 944cabd9cbb9dd61e2ff276dd230b85dc028370a

[dreammaster]

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:
944cabd9cb TITANIC: Fix compiler warnings


Commit: 944cabd9cbb9dd61e2ff276dd230b85dc028370a
    https://github.com/scummvm/scummvm/commit/944cabd9cbb9dd61e2ff276dd230b85dc028370a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-01T21:23:50-04:00

Commit Message:
TITANIC: Fix compiler warnings

Changed paths:
    engines/titanic/true_talk/liftbot_script.cpp
    engines/titanic/true_talk/succubus_script.cpp
    engines/titanic/true_talk/tt_word.h



diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp
index b37288d..ab995b7 100644
--- a/engines/titanic/true_talk/liftbot_script.cpp
+++ b/engines/titanic/true_talk/liftbot_script.cpp
@@ -591,7 +591,8 @@ int LiftbotScript::sentence1(const TTsentence *sentence) {
 	else
 		classSet = false;
 
-	uint newId = 0, diff = 1;
+	uint newId = 0;
+	int diff = 1;
 	if (sentence->localWord("promenade")) {
 		newId = 210718;
 	} else if (sentence->localWord("bar")) {
diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp
index c0c9c98..db537c6 100644
--- a/engines/titanic/true_talk/succubus_script.cpp
+++ b/engines/titanic/true_talk/succubus_script.cpp
@@ -198,7 +198,7 @@ int SuccUBusScript::updateState(uint oldId, uint newId, int index) {
 			return 230125;
 	}
 
-	static const int UPDATE_STATES[][2] = {
+	static const uint UPDATE_STATES[][2] = {
 		{ 230078, 1 }, { 230106, 2 }, { 230112, 3 }, { 230115, 4 },
 		{ 230127, 5 }, { 230140, 6 }, { 230156, 7 }, { 230157, 8 },
 		{ 230159, 9 }, { 230160, 10 }, { 230161, 11 }, { 230072, 12 }
diff --git a/engines/titanic/true_talk/tt_word.h b/engines/titanic/true_talk/tt_word.h
index 428a3e3..7fd61c3 100644
--- a/engines/titanic/true_talk/tt_word.h
+++ b/engines/titanic/true_talk/tt_word.h
@@ -35,16 +35,7 @@ namespace Titanic {
 enum WordClass { 
 	WC_UNKNOWN = 0, WC_ACTION = 1, WC_THING = 2, WC_ABSTRACT = 3,
 	WC_ARTICLE = 4, WC_CONJUNCTION = 5, WC_PRONOUN = 6,
-	WC_PREPOSITION = 7, WC_ADJECTIVE = 8, WC_ADVERB = 9,
-	// TODO: These may not actually be part of this enum
-	WC_UNK_ACTION = 10,
-	WC_ATRANS = 11,		// transfer possession, eg: give/take
-	WC_PTRANS = 12,		// physical transfer, eg: go
-	WC_PROPEL = 13,		// act of applying a force, eg: hit
-	WC_MTRANS = 14,		// mental transfer, eg: see, hear
-	WC_BUILD = 15, WC_ATTEND = 16, WC_SPEAK = 17, WC_GRASP = 18,
-	WC_MOVE = 19, WC_INGEST = 20, WC_EXPEL = 21, WC_STRANS = 22,
-	WC_ISA = 23
+	WC_PREPOSITION = 7, WC_ADJECTIVE = 8, WC_ADVERB = 9
 };
 
 class TTword {