aboutsummaryrefslogtreecommitdiff
path: root/engines/mads
diff options
context:
space:
mode:
authorPaul Gilbert2014-03-17 00:20:50 -0400
committerPaul Gilbert2014-03-17 00:20:50 -0400
commite6b73f4938e2bdb3601f6d567336fe8167ea7e1f (patch)
treecc1e0f6b7cabe3276a0a5b9dd0e5d6ee16b3d990 /engines/mads
parentb831323c85bb1ca26368cee6690d4664c37e9c0b (diff)
downloadscummvm-rg350-e6b73f4938e2bdb3601f6d567336fe8167ea7e1f.tar.gz
scummvm-rg350-e6b73f4938e2bdb3601f6d567336fe8167ea7e1f.tar.bz2
scummvm-rg350-e6b73f4938e2bdb3601f6d567336fe8167ea7e1f.zip
MADS: Actions text in the UI now displaying correctly
Diffstat (limited to 'engines/mads')
-rw-r--r--engines/mads/scene.h2
-rw-r--r--engines/mads/user_interface.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index dce799a378..3a94754dd2 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -199,7 +199,7 @@ public:
/**
* Returns a vocab entry
*/
- Common::String getVocab(int vocabId) { return _vocabStrings[vocabId]; }
+ Common::String getVocab(int vocabId) { return _vocabStrings[vocabId - 1]; }
/**
* Clear the data for the scene
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 985e28872a..5ab0b0f356 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -129,8 +129,8 @@ void UserInterface::drawTextElements() {
} else {
// Draw the actions
drawActions();
-// drawInventoryList();
-// drawItemVocabList();
+ drawInventoryList();
+ drawItemVocabList();
}
}
@@ -183,7 +183,7 @@ void UserInterface::writeVocab(ScrCategory category, int id) {
_vm->_font->setColorMode(id == _selectedActionIndex ? 2 : 0);
}
vocabStr = scene.getVocab(vocabId);
- vocabStr.toUppercase();
+ vocabStr.setChar(toupper(vocabStr[0]), 0);
font->writeString(this, vocabStr, Common::Point(bounds.left, bounds.top));
break;
@@ -195,7 +195,7 @@ void UserInterface::writeVocab(ScrCategory category, int id) {
} else {
_vm->_font->setColorMode(id == _selectedInvIndex ? 2 : 0);
vocabStr = scene.getVocab(vocabId);
- vocabStr.toUppercase();
+ vocabStr.setChar(toupper(vocabStr[0]), 0);
font->writeString(this, vocabStr, Common::Point(bounds.left, bounds.top));
break;
}
@@ -235,7 +235,7 @@ void UserInterface::writeVocab(ScrCategory category, int id) {
} else {
_vm->_font->setColorMode(id == _selectedInvIndex ? 2 : 0);
vocabStr = scene.getVocab(vocabId);
- vocabStr.toUppercase();
+ vocabStr.setChar(toupper(vocabStr[0]), 0);
font->writeString(this, vocabStr, Common::Point(bounds.left, bounds.top));
break;
}