diff options
| author | Paul Gilbert | 2014-04-03 22:36:36 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-03 22:36:36 -0400 |
| commit | 25b93a11ee28256331bb52ccdf5441e357c367c1 (patch) | |
| tree | 81d894f8c3fe34b2a67c35aa4d17656e75842472 /engines | |
| parent | d163ee088a9f3e49463fddd05a41d1b1530e77db (diff) | |
| download | scummvm-rg350-25b93a11ee28256331bb52ccdf5441e357c367c1.tar.gz scummvm-rg350-25b93a11ee28256331bb52ccdf5441e357c367c1.tar.bz2 scummvm-rg350-25b93a11ee28256331bb52ccdf5441e357c367c1.zip | |
MADS: Fix hotspot loading, and a couple of other warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mads/nebular/dialogs_nebular.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/user_interface.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp index fea5fa5b75..bfc225ee66 100644 --- a/engines/mads/nebular/dialogs_nebular.cpp +++ b/engines/mads/nebular/dialogs_nebular.cpp @@ -124,7 +124,7 @@ bool DialogsNebular::show(int msgId) { Common::String valStr; Common::String dialogText; bool result = true; - bool centerFlag; + bool centerFlag = false; bool underlineFlag; bool commandFlag; bool crFlag; @@ -268,7 +268,7 @@ bool DialogsNebular::textNoun(Common::String &dialogText, int nounNum, bool DialogsNebular::commandCheck(const char *idStr, Common::String &valStr, const Common::String &command) { - int idLen = strlen(idStr); + uint idLen = strlen(idStr); valStr = (command.size() <= idLen) ? "" : Common::String(command.c_str() + idLen); diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp index 4b174e8266..d229c39c26 100644 --- a/engines/mads/user_interface.cpp +++ b/engines/mads/user_interface.cpp @@ -450,7 +450,7 @@ void UserInterface::loadElements() { CAT_INV_ANIM, 0); } - if (!_vm->_game->_screenObjects._inputMode == kInputBuildingSentences || + if (_vm->_game->_screenObjects._inputMode == kInputBuildingSentences || _vm->_game->_screenObjects._inputMode == kInputLimitedSentences) { _categoryIndexes[CAT_HOTSPOT - 1] = _vm->_game->_screenObjects.size() + 1; for (int hotspotIdx = scene._hotspots.size() - 1; hotspotIdx >= 0; --hotspotIdx) { |