aboutsummaryrefslogtreecommitdiff
path: root/engines/hugo/parser_v3d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/hugo/parser_v3d.cpp')
-rw-r--r--engines/hugo/parser_v3d.cpp65
1 files changed, 33 insertions, 32 deletions
diff --git a/engines/hugo/parser_v3d.cpp b/engines/hugo/parser_v3d.cpp
index 501d8fba20..e7cc387161 100644
--- a/engines/hugo/parser_v3d.cpp
+++ b/engines/hugo/parser_v3d.cpp
@@ -39,10 +39,11 @@
#include "hugo/schedule.h"
#include "hugo/util.h"
#include "hugo/sound.h"
+#include "hugo/object.h"
namespace Hugo {
-Parser_v3d::Parser_v3d(HugoEngine &vm) : Parser_v1w(vm) {
+Parser_v3d::Parser_v3d(HugoEngine *vm) : Parser_v1w(vm) {
}
Parser_v3d::~Parser_v3d() {
@@ -52,11 +53,11 @@ Parser_v3d::~Parser_v3d() {
void Parser_v3d::lineHandler() {
debugC(1, kDebugParser, "lineHandler()");
- status_t &gameStatus = _vm.getGameStatus();
+ status_t &gameStatus = _vm->getGameStatus();
// Toggle God Mode
if (!strncmp(_line, "PPG", 3)) {
- _vm.sound().playSound(!_vm._soundTest, BOTH_CHANNELS, HIGH_PRI);
+ _vm->_sound->playSound(!_vm->_soundTest, BOTH_CHANNELS, HIGH_PRI);
gameStatus.godModeFl ^= 1;
return;
}
@@ -71,9 +72,9 @@ void Parser_v3d::lineHandler() {
if (gameStatus.godModeFl) {
// Special code to allow me to go straight to any screen
if (strstr(_line, "goto")) {
- for (int i = 0; i < _vm._numScreens; i++) {
- if (!strcmp(&_line[strlen("goto") + 1], _vm._screenNames[i])) {
- _vm.scheduler().newScreen(i);
+ for (int i = 0; i < _vm->_numScreens; i++) {
+ if (!strcmp(&_line[strlen("goto") + 1], _vm->_screenNames[i])) {
+ _vm->_scheduler->newScreen(i);
return;
}
}
@@ -81,17 +82,17 @@ void Parser_v3d::lineHandler() {
// Special code to allow me to get objects from anywhere
if (strstr(_line, "fetch all")) {
- for (int i = 0; i < _vm._numObj; i++) {
- if (_vm._objects[i].genericCmd & TAKE)
- takeObject(&_vm._objects[i]);
+ for (int i = 0; i < _vm->_numObj; i++) {
+ if (_vm->_object->_objects[i].genericCmd & TAKE)
+ takeObject(&_vm->_object->_objects[i]);
}
return;
}
if (strstr(_line, "fetch")) {
- for (int i = 0; i < _vm._numObj; i++) {
- if (!strcmp(&_line[strlen("fetch") + 1], _vm._arrayNouns[_vm._objects[i].nounIndex][0])) {
- takeObject(&_vm._objects[i]);
+ for (int i = 0; i < _vm->_numObj; i++) {
+ if (!strcmp(&_line[strlen("fetch") + 1], _vm->_arrayNouns[_vm->_object->_objects[i].nounIndex][0])) {
+ takeObject(&_vm->_object->_objects[i]);
return;
}
}
@@ -99,9 +100,9 @@ void Parser_v3d::lineHandler() {
// Special code to allow me to goto objects
if (strstr(_line, "find")) {
- for (int i = 0; i < _vm._numObj; i++) {
- if (!strcmp(&_line[strlen("find") + 1], _vm._arrayNouns[_vm._objects[i].nounIndex][0])) {
- _vm.scheduler().newScreen(_vm._objects[i].screenIndex);
+ for (int i = 0; i < _vm->_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;
}
}
@@ -111,8 +112,8 @@ void Parser_v3d::lineHandler() {
// Special meta commands
// EXIT/QUIT
if (!strcmp("exit", _line) || strstr(_line, "quit")) {
- if (Utils::Box(BOX_YESNO, "%s", _vm._textParser[kTBExit_1d]) != 0)
- _vm.endGame();
+ if (Utils::Box(BOX_YESNO, "%s", _vm->_textParser[kTBExit_1d]) != 0)
+ _vm->endGame();
else
return;
}
@@ -123,14 +124,14 @@ void Parser_v3d::lineHandler() {
if (gameStatus.gameOverFl)
Utils::gameOverMsg();
else
-// _vm.file().saveOrRestore(true);
+// _vm->_file->saveOrRestore(true);
warning("STUB: saveOrRestore()");
return;
}
if (!strcmp("restore", _line)) {
_config.soundFl = false;
-// _vm.file().saveOrRestore(false);
+// _vm->_file->saveOrRestore(false);
warning("STUB: saveOrRestore()");
return;
}
@@ -150,9 +151,9 @@ void Parser_v3d::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++) {
- object_t *obj = &_vm._objects[i];
- if (isWordPresent(_vm._arrayNouns[obj->nounIndex])) {
+ for (int i = 0; i < _vm->_numObj; i++) {
+ object_t *obj = &_vm->_object->_objects[i];
+ if (isWordPresent(_vm->_arrayNouns[obj->nounIndex])) {
if (isObjectVerb(obj, farComment) || isGenericVerb(obj, farComment))
return;
}
@@ -160,8 +161,8 @@ void Parser_v3d::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++) {
- object_t *obj = &_vm._objects[i];
+ for (int i = 0; i < _vm->_numObj; i++) {
+ object_t *obj = &_vm->_object->_objects[i];
if (obj->verbOnlyFl) {
char contextComment[XBYTES * 5] = ""; // Unused comment for context objects
if (isObjectVerb(obj, contextComment) || isGenericVerb(obj, contextComment))
@@ -170,13 +171,13 @@ void Parser_v3d::lineHandler() {
}
// No objects match command line, try background and catchall commands
- if (isBackgroundWord(_vm._backgroundObjects[*_vm._screen_p]))
+ if (isBackgroundWord(_vm->_backgroundObjects[*_vm->_screen_p]))
return;
- if (isCatchallVerb(_vm._backgroundObjects[*_vm._screen_p]))
+ if (isCatchallVerb(_vm->_backgroundObjects[*_vm->_screen_p]))
return;
- if (isBackgroundWord(_vm._catchallList))
+ if (isBackgroundWord(_vm->_catchallList))
return;
- if (isCatchallVerb(_vm._catchallList))
+ if (isCatchallVerb(_vm->_catchallList))
return;
// If a not-near comment was generated, print it
@@ -190,13 +191,13 @@ void Parser_v3d::lineHandler() {
char *noun = findNoun();
if (verb && noun) { // A combination I didn't think of
- Utils::Box(BOX_ANY, "%s", _vm._textParser[kTBNoPoint]);
+ Utils::Box(BOX_ANY, "%s", _vm->_textParser[kTBNoPoint]);
} else if (noun) {
- Utils::Box(BOX_ANY, "%s", _vm._textParser[kTBNoun]);
+ Utils::Box(BOX_ANY, "%s", _vm->_textParser[kTBNoun]);
} else if (verb) {
- Utils::Box(BOX_ANY, "%s", _vm._textParser[kTBVerb]);
+ Utils::Box(BOX_ANY, "%s", _vm->_textParser[kTBVerb]);
} else {
- Utils::Box(BOX_ANY, "%s", _vm._textParser[kTBEh]);
+ Utils::Box(BOX_ANY, "%s", _vm->_textParser[kTBEh]);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 08:02:09 +0000