diff options
| author | Arnaud Boutonné | 2010-11-11 23:04:04 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2010-11-11 23:04:04 +0000 |
| commit | a0199df818a90fcd142ef7d0adbc3bbda98003ac (patch) | |
| tree | 6233a08e2bc5146387bd7728ab4339df6ac6c656 /engines/hugo/parser_v1w.cpp | |
| parent | a65ab98726442b0e207c2466b238535bb2a6b016 (diff) | |
| download | scummvm-rg350-a0199df818a90fcd142ef7d0adbc3bbda98003ac.tar.gz scummvm-rg350-a0199df818a90fcd142ef7d0adbc3bbda98003ac.tar.bz2 scummvm-rg350-a0199df818a90fcd142ef7d0adbc3bbda98003ac.zip | |
HUGO: Cleanup, move several functions and variables to the object class
svn-id: r54212
Diffstat (limited to 'engines/hugo/parser_v1w.cpp')
| -rw-r--r-- | engines/hugo/parser_v1w.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/hugo/parser_v1w.cpp b/engines/hugo/parser_v1w.cpp index 96442e4fcd..9155942130 100644 --- a/engines/hugo/parser_v1w.cpp +++ b/engines/hugo/parser_v1w.cpp @@ -334,7 +334,7 @@ void Parser_v1w::lineHandler() { // Special code to allow me to get objects from anywhere if (strstr(_line, "fetch all")) { - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _vm->_object->_numObj; i++) { if (_vm->_object->_objects[i].genericCmd & TAKE) takeObject(&_vm->_object->_objects[i]); } @@ -342,7 +342,7 @@ void Parser_v1w::lineHandler() { } if (strstr(_line, "fetch")) { - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _vm->_object->_numObj; i++) { if (!strcmp(&_line[strlen("fetch") + 1], _vm->_arrayNouns[_vm->_object->_objects[i].nounIndex][0])) { takeObject(&_vm->_object->_objects[i]); return; @@ -352,7 +352,7 @@ void Parser_v1w::lineHandler() { // Special code to allow me to goto objects if (strstr(_line, "find")) { - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _vm->_object->_numObj; i++) { if (!strcmp(&_line[strlen("find") + 1], _vm->_arrayNouns[_vm->_object->_objects[i].nounIndex][0])) { _vm->_scheduler->newScreen(_vm->_object->_objects[i].screenIndex); return; @@ -396,7 +396,7 @@ void Parser_v1w::lineHandler() { char farComment[XBYTES * 5] = ""; // hold 5 line comment if object not nearby // Test for nearby objects referenced explicitly - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _vm->_object->_numObj; i++) { object_t *obj = &_vm->_object->_objects[i]; if (isWordPresent(_vm->_arrayNouns[obj->nounIndex])) { if (isObjectVerb(obj, farComment) || isGenericVerb(obj, farComment)) @@ -406,7 +406,7 @@ void Parser_v1w::lineHandler() { // Test for nearby objects that only require a verb // Note comment is unused if not near. - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _vm->_object->_numObj; i++) { object_t *obj = &_vm->_object->_objects[i]; if (obj->verbOnlyFl) { char contextComment[XBYTES * 5] = ""; // Unused comment for context objects |