HUGO: Replace Utils::Box by Utils::notifyBox + Common::String::format

This commit is contained in:
Max Horn 2011-03-21 13:07:23 +01:00
parent 458ebbafd2
commit dd88f39bc7
17 changed files with 97 additions and 117 deletions

View file

@ -175,16 +175,16 @@ void Parser_v2d::lineHandler() {
&& !isCatchallVerb_v1(false, noun, verb, _backgroundObjects[*_vm->_screen_p])
&& !isCatchallVerb_v1(false, noun, verb, _catchallList)) {
if (*farComment != '\0') { // An object matched but not near enough
Utils::Box(kBoxAny, "%s", farComment);
Utils::notifyBox(farComment);
} else if (_vm->_maze.enabledFl && (verb == _vm->_text->getVerb(_vm->_look, 0))) {
Utils::Box(kBoxAny, "%s", _vm->_text->getTextParser(kTBMaze));
Utils::notifyBox(_vm->_text->getTextParser(kTBMaze));
_vm->_object->showTakeables();
} else if (verb && noun) { // A combination I didn't think of
Utils::Box(kBoxAny, "%s", _vm->_text->getTextParser(kTBNoUse_2d));
Utils::notifyBox(_vm->_text->getTextParser(kTBNoUse_2d));
} else if (verb || noun) {
Utils::Box(kBoxAny, "%s", _vm->_text->getTextParser(kTBNoun));
Utils::notifyBox(_vm->_text->getTextParser(kTBNoun));
} else {
Utils::Box(kBoxAny, "%s", _vm->_text->getTextParser(kTBEh_2d));
Utils::notifyBox(_vm->_text->getTextParser(kTBEh_2d));
}
}
}