libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-28 22:23:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fix compiler warnings

Browse Source
This commit is contained in:
Paul Gilbert 2016-08-01 21:23:50 -04:00
parent 81c15b11ca
commit 944cabd9cb
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/titanic/true_talk/liftbot_script.cpp
View File

@ -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")) {

2
engines/titanic/true_talk/succubus_script.cpp
View File

@ -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 }

11
engines/titanic/true_talk/tt_word.h
View File

@ -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 {