From 179427c78f2a634beb4485661bf2b1fc78ef559f Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 13 Jun 2012 21:18:37 +0200 Subject: HUGO: Rename pointers --- engines/hugo/display.cpp | 14 ++-- engines/hugo/display.h | 6 +- engines/hugo/file.cpp | 18 ++--- engines/hugo/file.h | 4 +- engines/hugo/game.h | 2 +- engines/hugo/hugo.cpp | 4 +- engines/hugo/hugo.h | 2 +- engines/hugo/mouse.cpp | 4 +- engines/hugo/object.cpp | 4 +- engines/hugo/object_v1d.cpp | 8 +- engines/hugo/object_v1w.cpp | 8 +- engines/hugo/object_v2d.cpp | 8 +- engines/hugo/object_v3d.cpp | 6 +- engines/hugo/parser.cpp | 4 +- engines/hugo/parser_v1d.cpp | 8 +- engines/hugo/parser_v1w.cpp | 4 +- engines/hugo/parser_v2d.cpp | 6 +- engines/hugo/parser_v3d.cpp | 12 +-- engines/hugo/route.cpp | 4 +- engines/hugo/schedule.cpp | 188 ++++++++++++++++++++++---------------------- engines/hugo/sound.cpp | 14 ++-- engines/hugo/sound.h | 2 +- 22 files changed, 165 insertions(+), 165 deletions(-) (limited to 'engines') diff --git a/engines/hugo/display.cpp b/engines/hugo/display.cpp index 34b0303eee..b86b1f0366 100644 --- a/engines/hugo/display.cpp +++ b/engines/hugo/display.cpp @@ -657,7 +657,7 @@ void Screen::drawBoundaries() { for (int i = 0; i < _vm->_object->_numObj; i++) { Object *obj = &_vm->_object->_objects[i]; // Get pointer to object - if (obj->_screenIndex == *_vm->_screen_p) { + if (obj->_screenIndex == *_vm->_screenPtr) { if ((obj->_currImagePtr != 0) && (obj->_cycling != kCycleInvisible)) drawRectangle(false, obj->_x + obj->_currImagePtr->_x1, obj->_y + obj->_currImagePtr->_y1, obj->_x + obj->_currImagePtr->_x2, obj->_y + obj->_currImagePtr->_y2, _TLIGHTGREEN); @@ -730,10 +730,10 @@ void Screen_v1d::loadFontArr(Common::ReadStream &in) { * processed object by looking down the current column for an overlay * base byte set (in which case the object is foreground). */ -OverlayState Screen_v1d::findOvl(Seq *seqPtr, ImagePtr dst_p, uint16 y) { +OverlayState Screen_v1d::findOvl(Seq *seqPtr, ImagePtr dstPtr, uint16 y) { debugC(4, kDebugDisplay, "findOvl()"); - uint16 index = (uint16)(dst_p - _frontBuffer) >> 3; + uint16 index = (uint16)(dstPtr - _frontBuffer) >> 3; for (int i = 0; i < seqPtr->_lines-y; i++) { // Each line in object if (_vm->_object->getBaseBoundary(index)) // If any overlay base byte is non-zero then the object is foreground, else back. @@ -799,14 +799,14 @@ void Screen_v1w::loadFontArr(Common::ReadStream &in) { * processed object by looking down the current column for an overlay * base bit set (in which case the object is foreground). */ -OverlayState Screen_v1w::findOvl(Seq *seqPtr, ImagePtr dst_p, uint16 y) { +OverlayState Screen_v1w::findOvl(Seq *seqPtr, ImagePtr dstPtr, uint16 y) { debugC(4, kDebugDisplay, "findOvl()"); for (; y < seqPtr->_lines; y++) { // Each line in object - byte ovb = _vm->_object->getBaseBoundary((uint16)(dst_p - _frontBuffer) >> 3); // Ptr into overlay bits - if (ovb & (0x80 >> ((uint16)(dst_p - _frontBuffer) & 7))) // Overlay bit is set + byte ovb = _vm->_object->getBaseBoundary((uint16)(dstPtr - _frontBuffer) >> 3); // Ptr into overlay bits + if (ovb & (0x80 >> ((uint16)(dstPtr - _frontBuffer) & 7))) // Overlay bit is set return kOvlForeground; // Found a bit - must be foreground - dst_p += kXPix; + dstPtr += kXPix; } return kOvlBackground; // No bits set, must be background diff --git a/engines/hugo/display.h b/engines/hugo/display.h index 5fab2f18cc..00dc1b743c 100644 --- a/engines/hugo/display.h +++ b/engines/hugo/display.h @@ -114,7 +114,7 @@ protected: inline bool isInY(const int16 y, const Rect *rect) const; inline bool isOverlapping(const Rect *rectA, const Rect *rectB) const; - virtual OverlayState findOvl(Seq *seqPtr, ImagePtr dst_p, uint16 y) = 0; + virtual OverlayState findOvl(Seq *seqPtr, ImagePtr dstPtr, uint16 y) = 0; private: byte *_curPalette; @@ -150,7 +150,7 @@ public: void loadFont(int16 fontId); void loadFontArr(Common::ReadStream &in); protected: - OverlayState findOvl(Seq *seqPtr, ImagePtr dst_p, uint16 y); + OverlayState findOvl(Seq *seqPtr, ImagePtr dstPtr, uint16 y); }; class Screen_v1w : public Screen { @@ -161,7 +161,7 @@ public: void loadFont(int16 fontId); void loadFontArr(Common::ReadStream &in); protected: - OverlayState findOvl(Seq *seqPtr, ImagePtr dst_p, uint16 y); + OverlayState findOvl(Seq *seqPtr, ImagePtr dstPtr, uint16 y); }; } // End of namespace Hugo diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp index b78a26241b..5556f5abc0 100644 --- a/engines/hugo/file.cpp +++ b/engines/hugo/file.cpp @@ -92,7 +92,7 @@ const char *FileManager::getUifFilename() const { * Return original plane data ptr */ byte *FileManager::convertPCC(byte *p, const uint16 y, const uint16 bpl, ImagePtr dataPtr) const { - debugC(2, kDebugFile, "convertPCC(byte *p, %d, %d, ImagePtr data_p)", y, bpl); + debugC(2, kDebugFile, "convertPCC(byte *p, %d, %d, ImagePtr dataPtr)", y, bpl); dataPtr += y * bpl * 8; // Point to correct DIB line for (int16 r = 0, g = bpl, b = g + bpl, i = b + bpl; r < bpl; r++, g++, b++, i++) { // Each byte in all planes @@ -282,7 +282,7 @@ void FileManager::readImage(const int objNum, Object *objPtr) { * Read sound (or music) file data. Call with SILENCE to free-up * any allocated memory. Also returns size of data */ -sound_pt FileManager::getSound(const int16 sound, uint16 *size) { +SoundPtr FileManager::getSound(const int16 sound, uint16 *size) { debugC(1, kDebugFile, "getSound(%d)", sound); // No more to do if SILENCE (called for cleanup purposes) @@ -298,25 +298,25 @@ sound_pt FileManager::getSound(const int16 sound, uint16 *size) { if (!_hasReadHeader) { for (int i = 0; i < kMaxSounds; i++) { - _s_hdr[i]._size = fp.readUint16LE(); - _s_hdr[i]._offset = fp.readUint32LE(); + _soundHdr[i]._size = fp.readUint16LE(); + _soundHdr[i]._offset = fp.readUint32LE(); } if (fp.err()) error("Wrong sound file format"); _hasReadHeader = true; } - *size = _s_hdr[sound]._size; + *size = _soundHdr[sound]._size; if (*size == 0) error("Wrong sound file format or missing sound %d", sound); // Allocate memory for sound or music, if possible - sound_pt soundPtr = (byte *)malloc(_s_hdr[sound]._size); // Ptr to sound data + SoundPtr soundPtr = (byte *)malloc(_soundHdr[sound]._size); // Ptr to sound data assert(soundPtr); // Seek to data and read it - fp.seek(_s_hdr[sound]._offset, SEEK_SET); - if (fp.read(soundPtr, _s_hdr[sound]._size) != _s_hdr[sound]._size) + fp.seek(_soundHdr[sound]._offset, SEEK_SET); + if (fp.read(soundPtr, _soundHdr[sound]._size) != _soundHdr[sound]._size) error("Wrong sound file format"); fp.close(); @@ -513,7 +513,7 @@ bool FileManager::restoreGame(const int16 slot) { _vm->_maze._x4 = in->readSint16BE(); _vm->_maze._firstScreenIndex = in->readByte(); - _vm->_scheduler->restoreScreen(*_vm->_screen_p); + _vm->_scheduler->restoreScreen(*_vm->_screenPtr); if ((_vm->getGameStatus()._viewState = (Vstate) in->readByte()) != kViewPlay) _vm->_screen->hideCursor(); diff --git a/engines/hugo/file.h b/engines/hugo/file.h index 151b749ce7..e4aa7f7fec 100644 --- a/engines/hugo/file.h +++ b/engines/hugo/file.h @@ -47,7 +47,7 @@ public: FileManager(HugoEngine *vm); virtual ~FileManager(); - sound_pt getSound(const int16 sound, uint16 *size); + SoundPtr getSound(const int16 sound, uint16 *size); void readBootFile(); void readImage(const int objNum, Object *objPtr); @@ -118,7 +118,7 @@ protected: // If this is the first call, read the lookup table bool _hasReadHeader; - SoundHdr _s_hdr[kMaxSounds]; // Sound lookup table + SoundHdr _soundHdr[kMaxSounds]; // Sound lookup table private: byte *convertPCC(byte *p, const uint16 y, const uint16 bpl, ImagePtr dataPtr) const; diff --git a/engines/hugo/game.h b/engines/hugo/game.h index 29e3bf9b55..ed49ee8cbe 100644 --- a/engines/hugo/game.h +++ b/engines/hugo/game.h @@ -95,7 +95,7 @@ struct hugoBoot { // Common HUGO boot file * Game specific type definitions */ typedef byte *ImagePtr; // ptr to an object image (sprite) -typedef byte *sound_pt; // ptr to sound (or music) data +typedef byte *SoundPtr; // ptr to sound (or music) data /** * Structure for initializing maze processing diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index 5ae43b8b5a..f2db630198 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -427,7 +427,7 @@ bool HugoEngine::loadHugoDat() { _scheduler->loadActListArr(in); _scheduler->loadAlNewscrIndex(in); _hero = &_object->_objects[kHeroIndex]; // This always points to hero - _screen_p = &(_object->_objects[kHeroIndex]._screenIndex); // Current screen is hero's + _screenPtr = &(_object->_objects[kHeroIndex]._screenIndex); // Current screen is hero's _heroImage = kHeroIndex; // Current in use hero image for (int varnt = 0; varnt < _numVariant; varnt++) { @@ -660,7 +660,7 @@ void HugoEngine::readScreenFiles(const int screenNum) { void HugoEngine::setNewScreen(const int screenNum) { debugC(1, kDebugEngine, "setNewScreen(%d)", screenNum); - *_screen_p = screenNum; // HERO object + *_screenPtr = screenNum; // HERO object _object->setCarriedScreen(screenNum); // Carried objects } diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index 312f2272db..9f495a9037 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -226,7 +226,7 @@ public: int8 _normalTPS; // Number of ticks (frames) per second. // 8 for Win versions, 9 for DOS versions Object *_hero; - byte *_screen_p; + byte *_screenPtr; byte _heroImage; byte *_screenStates; Command _line; // Line of user text input diff --git a/engines/hugo/mouse.cpp b/engines/hugo/mouse.cpp index fef3cca608..a95170696c 100644 --- a/engines/hugo/mouse.cpp +++ b/engines/hugo/mouse.cpp @@ -223,7 +223,7 @@ void MouseHandler::processLeftClick(const int16 objId, const int16 cx, const int _vm->_screen->displayList(kDisplayAdd, 0, kDibOffY, kXPix, kInvDy); break; case kExitHotspot: // Walk to exit hotspot - i = findExit(cx, cy, *_vm->_screen_p); + i = findExit(cx, cy, *_vm->_screenPtr); x = _hotspots[i]._viewx; y = _hotspots[i]._viewy; if (x >= 0) { // Hotspot refers to an exit @@ -327,7 +327,7 @@ void MouseHandler::mouseHandler() { // Process cursor over an exit hotspot if (objId == -1) { - int i = findExit(cx, cy, *_vm->_screen_p); + int i = findExit(cx, cy, *_vm->_screenPtr); if (i != -1 && _hotspots[i]._viewx >= 0) { objId = kExitHotspot; cursorText(_vm->_text->getTextMouse(kMsExit), cx, cy, U_FONT8, _TBRIGHTWHITE); diff --git a/engines/hugo/object.cpp b/engines/hugo/object.cpp index e0dd0abd49..7b4783e4d8 100644 --- a/engines/hugo/object.cpp +++ b/engines/hugo/object.cpp @@ -199,7 +199,7 @@ int16 ObjectHandler::findObject(uint16 x, uint16 y) { // Check objects on screen for (int i = 0; i < _numObj; i++, obj++) { // Object must be in current screen and "useful" - if (obj->_screenIndex == *_vm->_screen_p && (obj->_genericCmd || obj->_objValue || obj->_cmdIndex)) { + if (obj->_screenIndex == *_vm->_screenPtr && (obj->_genericCmd || obj->_objValue || obj->_cmdIndex)) { Seq *curImage = obj->_currImagePtr; // Object must have a visible image... if (curImage != 0 && obj->_cycling != kCycleInvisible) { @@ -347,7 +347,7 @@ void ObjectHandler::showTakeables() { for (int j = 0; j < _numObj; j++) { Object *obj = &_objects[j]; if ((obj->_cycling != kCycleInvisible) && - (obj->_screenIndex == *_vm->_screen_p) && + (obj->_screenIndex == *_vm->_screenPtr) && (((TAKE & obj->_genericCmd) == TAKE) || obj->_objValue)) { Utils::notifyBox(Common::String::format("You can also see:\n%s.", _vm->_text->getNoun(obj->_nounIndex, LOOK_NAME))); } diff --git a/engines/hugo/object_v1d.cpp b/engines/hugo/object_v1d.cpp index e5fedb3b2a..7f88e9e5b8 100644 --- a/engines/hugo/object_v1d.cpp +++ b/engines/hugo/object_v1d.cpp @@ -64,7 +64,7 @@ void ObjectHandler_v1d::updateImages() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling >= kCycleAlmostInvisible)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling >= kCycleAlmostInvisible)) objindex[objNumb++] = i; } @@ -185,7 +185,7 @@ void ObjectHandler_v1d::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if (obj->_screenIndex == *_vm->_screen_p) { + if (obj->_screenIndex == *_vm->_screenPtr) { switch (obj->_pathType) { case kPathChase: { // Allowable motion wrt boundary @@ -272,7 +272,7 @@ void ObjectHandler_v1d::moveObjects() { // Move objects, allowing for boundaries for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_vx || obj->_vy)) { + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_vx || obj->_vy)) { // Only process if it's moving // Do object movement. Delta_x,y return allowed movement in x,y @@ -327,7 +327,7 @@ void ObjectHandler_v1d::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) clearBoundary(obj->_oldx + currImage->_x1, obj->_oldx + currImage->_x2, obj->_oldy + currImage->_y2); } diff --git a/engines/hugo/object_v1w.cpp b/engines/hugo/object_v1w.cpp index e1e8496d9d..61b0f2e48a 100644 --- a/engines/hugo/object_v1w.cpp +++ b/engines/hugo/object_v1w.cpp @@ -64,7 +64,7 @@ void ObjectHandler_v1w::updateImages() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling >= kCycleAlmostInvisible)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling >= kCycleAlmostInvisible)) objindex[objNumb++] = i; } @@ -182,7 +182,7 @@ void ObjectHandler_v1w::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if (obj->_screenIndex == *_vm->_screen_p) { + if (obj->_screenIndex == *_vm->_screenPtr) { switch (obj->_pathType) { case kPathChase: case kPathChase2: { @@ -282,7 +282,7 @@ void ObjectHandler_v1w::moveObjects() { // Move objects, allowing for boundaries for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_vx || obj->_vy)) { + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_vx || obj->_vy)) { // Only process if it's moving // Do object movement. Delta_x,y return allowed movement in x,y @@ -337,7 +337,7 @@ void ObjectHandler_v1w::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) clearBoundary(obj->_oldx + currImage->_x1, obj->_oldx + currImage->_x2, obj->_oldy + currImage->_y2); } diff --git a/engines/hugo/object_v2d.cpp b/engines/hugo/object_v2d.cpp index f0d83269d5..7cb6c20dd0 100644 --- a/engines/hugo/object_v2d.cpp +++ b/engines/hugo/object_v2d.cpp @@ -64,7 +64,7 @@ void ObjectHandler_v2d::updateImages() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling >= kCycleAlmostInvisible)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling >= kCycleAlmostInvisible)) objindex[objNumb++] = i; } @@ -185,7 +185,7 @@ void ObjectHandler_v2d::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if (obj->_screenIndex == *_vm->_screen_p) { + if (obj->_screenIndex == *_vm->_screenPtr) { switch (obj->_pathType) { case kPathChase: case kPathChase2: { @@ -285,7 +285,7 @@ void ObjectHandler_v2d::moveObjects() { // Move objects, allowing for boundaries for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_vx || obj->_vy)) { + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_vx || obj->_vy)) { // Only process if it's moving // Do object movement. Delta_x,y return allowed movement in x,y @@ -340,7 +340,7 @@ void ObjectHandler_v2d::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) clearBoundary(obj->_oldx + currImage->_x1, obj->_oldx + currImage->_x2, obj->_oldy + currImage->_y2); } diff --git a/engines/hugo/object_v3d.cpp b/engines/hugo/object_v3d.cpp index 13c9c8c93d..7bb4b95b4a 100644 --- a/engines/hugo/object_v3d.cpp +++ b/engines/hugo/object_v3d.cpp @@ -66,7 +66,7 @@ void ObjectHandler_v3d::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if (obj->_screenIndex == *_vm->_screen_p) { + if (obj->_screenIndex == *_vm->_screenPtr) { switch (obj->_pathType) { case kPathChase: case kPathChase2: { @@ -167,7 +167,7 @@ void ObjectHandler_v3d::moveObjects() { // Move objects, allowing for boundaries for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_vx || obj->_vy)) { + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_vx || obj->_vy)) { // Only process if it's moving // Do object movement. Delta_x,y return allowed movement in x,y @@ -222,7 +222,7 @@ void ObjectHandler_v3d::moveObjects() { for (int i = 0; i < _numObj; i++) { Object *obj = &_objects[i]; // Get pointer to object Seq *currImage = obj->_currImagePtr; // Get ptr to current image - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling > kCycleAlmostInvisible) && (obj->_priority == kPriorityFloating)) clearBoundary(obj->_oldx + currImage->_x1, obj->_oldx + currImage->_x2, obj->_oldy + currImage->_y2); } diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp index 68343a0374..d18cc2181c 100644 --- a/engines/hugo/parser.cpp +++ b/engines/hugo/parser.cpp @@ -164,11 +164,11 @@ void Parser::loadArrayReqs(Common::SeekableReadStream &in) { const char *Parser::useBG(const char *name) { debugC(1, kDebugEngine, "useBG(%s)", name); - ObjectList p = _backgroundObjects[*_vm->_screen_p]; + ObjectList p = _backgroundObjects[*_vm->_screenPtr]; for (int i = 0; p[i]._verbIndex != 0; i++) { if ((name == _vm->_text->getNoun(p[i]._nounIndex, 0) && p[i]._verbIndex != _vm->_look) && - ((p[i]._roomState == kStateDontCare) || (p[i]._roomState == _vm->_screenStates[*_vm->_screen_p]))) + ((p[i]._roomState == kStateDontCare) || (p[i]._roomState == _vm->_screenStates[*_vm->_screenPtr]))) return _vm->_text->getVerb(p[i]._verbIndex, 0); } diff --git a/engines/hugo/parser_v1d.cpp b/engines/hugo/parser_v1d.cpp index f29a03f796..f29b0161f5 100644 --- a/engines/hugo/parser_v1d.cpp +++ b/engines/hugo/parser_v1d.cpp @@ -87,7 +87,7 @@ bool Parser_v1d::isNear_v1(const char *verb, const char *noun, Object *obj, char return false; } else if (obj->_carriedFl) { // Object is being carried return true; - } else if (obj->_screenIndex != *_vm->_screen_p) { // Not in same screen + } else if (obj->_screenIndex != *_vm->_screenPtr) { // Not in same screen if (obj->_objValue) strcpy (comment, _vm->_text->getTextParser(kCmtAny4)); return false; @@ -268,7 +268,7 @@ void Parser_v1d::dropObject(Object *obj) { debugC(1, kDebugParser, "dropObject(Object *obj)"); obj->_carriedFl = false; - obj->_screenIndex = *_vm->_screen_p; + obj->_screenIndex = *_vm->_screenPtr; if (obj->_seqNumb) // Don't change if no image to display obj->_cycling = kCycleNotCycling; obj->_x = _vm->_hero->_x - 1; @@ -410,7 +410,7 @@ void Parser_v1d::lineHandler() { return; } } - if ((*farComment == '\0') && isBackgroundWord_v1(noun, verb, _backgroundObjects[*_vm->_screen_p])) + if ((*farComment == '\0') && isBackgroundWord_v1(noun, verb, _backgroundObjects[*_vm->_screenPtr])) return; } while (noun); } @@ -418,7 +418,7 @@ void Parser_v1d::lineHandler() { if (*farComment != '\0') // An object matched but not near enough Utils::notifyBox(farComment); else if (!isCatchallVerb_v1(true, noun, verb, _catchallList) && - !isCatchallVerb_v1(false, noun, verb, _backgroundObjects[*_vm->_screen_p]) && + !isCatchallVerb_v1(false, noun, verb, _backgroundObjects[*_vm->_screenPtr]) && !isCatchallVerb_v1(false, noun, verb, _catchallList)) Utils::notifyBox(_vm->_text->getTextParser(kTBEh_1d)); } diff --git a/engines/hugo/parser_v1w.cpp b/engines/hugo/parser_v1w.cpp index 8c0da63554..3722ccc0e1 100644 --- a/engines/hugo/parser_v1w.cpp +++ b/engines/hugo/parser_v1w.cpp @@ -166,9 +166,9 @@ void Parser_v1w::lineHandler() { } // No objects match command line, try background and catchall commands - if (isBackgroundWord_v3(_backgroundObjects[*_vm->_screen_p])) + if (isBackgroundWord_v3(_backgroundObjects[*_vm->_screenPtr])) return; - if (isCatchallVerb_v3(_backgroundObjects[*_vm->_screen_p])) + if (isCatchallVerb_v3(_backgroundObjects[*_vm->_screenPtr])) return; if (isBackgroundWord_v3(_catchallList)) diff --git a/engines/hugo/parser_v2d.cpp b/engines/hugo/parser_v2d.cpp index 674836b90e..6d71186f49 100644 --- a/engines/hugo/parser_v2d.cpp +++ b/engines/hugo/parser_v2d.cpp @@ -160,15 +160,15 @@ void Parser_v2d::lineHandler() { return; } } - if ((*farComment != '\0') && isBackgroundWord_v1(noun, verb, _backgroundObjects[*_vm->_screen_p])) + if ((*farComment != '\0') && isBackgroundWord_v1(noun, verb, _backgroundObjects[*_vm->_screenPtr])) return; } while (noun); } noun = findNextNoun(noun); - if ( !isCatchallVerb_v1(true, noun, verb, _backgroundObjects[*_vm->_screen_p]) + if ( !isCatchallVerb_v1(true, noun, verb, _backgroundObjects[*_vm->_screenPtr]) && !isCatchallVerb_v1(true, noun, verb, _catchallList) - && !isCatchallVerb_v1(false, noun, verb, _backgroundObjects[*_vm->_screen_p]) + && !isCatchallVerb_v1(false, noun, verb, _backgroundObjects[*_vm->_screenPtr]) && !isCatchallVerb_v1(false, noun, verb, _catchallList)) { if (*farComment != '\0') { // An object matched but not near enough Utils::notifyBox(farComment); diff --git a/engines/hugo/parser_v3d.cpp b/engines/hugo/parser_v3d.cpp index 9bbaf49f67..a7e5896833 100644 --- a/engines/hugo/parser_v3d.cpp +++ b/engines/hugo/parser_v3d.cpp @@ -168,9 +168,9 @@ void Parser_v3d::lineHandler() { } // No objects match command line, try background and catchall commands - if (isBackgroundWord_v3(_backgroundObjects[*_vm->_screen_p])) + if (isBackgroundWord_v3(_backgroundObjects[*_vm->_screenPtr])) return; - if (isCatchallVerb_v3(_backgroundObjects[*_vm->_screen_p])) + if (isCatchallVerb_v3(_backgroundObjects[*_vm->_screenPtr])) return; if (isBackgroundWord_v3(_catchallList)) @@ -319,7 +319,7 @@ bool Parser_v3d::isNear_v3(Object *obj, const char *verb, char *comment) const { if (obj->_carriedFl) // Object is being carried return true; - if (obj->_screenIndex != *_vm->_screen_p) { + if (obj->_screenIndex != *_vm->_screenPtr) { // Not in same screen if (obj->_objValue) strcpy(comment, _vm->_text->getTextParser(kCmtAny1)); @@ -389,7 +389,7 @@ void Parser_v3d::dropObject(Object *obj) { debugC(1, kDebugParser, "dropObject(Object *obj)"); obj->_carriedFl = false; - obj->_screenIndex = *_vm->_screen_p; + obj->_screenIndex = *_vm->_screenPtr; if ((obj->_seqNumb > 1) || (obj->_seqList[0]._imageNbr > 1)) obj->_cycling = kCycleForward; else @@ -417,7 +417,7 @@ bool Parser_v3d::isCatchallVerb_v3(ObjectList obj) const { if (isWordPresent(_vm->_text->getVerbArray(obj[i]._verbIndex)) && obj[i]._nounIndex == 0 && (!obj[i]._matchFl || !findNoun()) && ((obj[i]._roomState == kStateDontCare) || - (obj[i]._roomState == _vm->_screenStates[*_vm->_screen_p]))) { + (obj[i]._roomState == _vm->_screenStates[*_vm->_screenPtr]))) { Utils::notifyBox(_vm->_file->fetchString(obj[i]._commentIndex)); _vm->_scheduler->processBonus(obj[i]._bonusIndex); @@ -445,7 +445,7 @@ bool Parser_v3d::isBackgroundWord_v3(ObjectList obj) const { if (isWordPresent(_vm->_text->getVerbArray(obj[i]._verbIndex)) && isWordPresent(_vm->_text->getNounArray(obj[i]._nounIndex)) && ((obj[i]._roomState == kStateDontCare) || - (obj[i]._roomState == _vm->_screenStates[*_vm->_screen_p]))) { + (obj[i]._roomState == _vm->_screenStates[*_vm->_screenPtr]))) { Utils::notifyBox(_vm->_file->fetchString(obj[i]._commentIndex)); _vm->_scheduler->processBonus(obj[i]._bonusIndex); return true; diff --git a/engines/hugo/route.cpp b/engines/hugo/route.cpp index 45d72bafb1..54dae88c28 100644 --- a/engines/hugo/route.cpp +++ b/engines/hugo/route.cpp @@ -335,7 +335,7 @@ bool Route::findRoute(const int16 cx, const int16 cy) { Object *obj; // Ptr to object int i; for (i = 1, obj = &_vm->_object->_objects[i]; i < _vm->_object->_numObj; i++, obj++) { - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling != kCycleInvisible) && (obj->_priority == kPriorityFloating)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling != kCycleInvisible) && (obj->_priority == kPriorityFloating)) _vm->_object->storeBoundary(obj->_oldx + obj->_currImagePtr->_x1, obj->_oldx + obj->_currImagePtr->_x2, obj->_oldy + obj->_currImagePtr->_y2); } @@ -350,7 +350,7 @@ bool Route::findRoute(const int16 cx, const int16 cy) { // Clear all object baselines from objbound for (i = 0, obj = _vm->_object->_objects; i < _vm->_object->_numObj; i++, obj++) { - if ((obj->_screenIndex == *_vm->_screen_p) && (obj->_cycling != kCycleInvisible) && (obj->_priority == kPriorityFloating)) + if ((obj->_screenIndex == *_vm->_screenPtr) && (obj->_cycling != kCycleInvisible) && (obj->_priority == kPriorityFloating)) _vm->_object->clearBoundary(obj->_oldx + obj->_currImagePtr->_x1, obj->_oldx + obj->_currImagePtr->_x2, obj->_oldy + obj->_currImagePtr->_y2); } diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp index 3bbec6670e..32b8a47df7 100644 --- a/engines/hugo/schedule.cpp +++ b/engines/hugo/schedule.cpp @@ -66,12 +66,12 @@ void Scheduler::initCypher() { void Scheduler::initEventQueue() { debugC(1, kDebugSchedule, "initEventQueue"); - // Chain next_p from first to last + // Chain nextEvent from first to last for (int i = kMaxEvents; --i;) _events[i - 1]._nextEvent = &_events[i]; _events[kMaxEvents - 1]._nextEvent = 0; - // Chain prev_p from last to first + // Chain prevEvent from last to first for (int i = 1; i < kMaxEvents; i++) _events[i]._prevEvent = &_events[i - 1]; _events[0]._prevEvent = 0; @@ -658,28 +658,28 @@ void Scheduler::processMaze(const int x1, const int x2, const int y1, const int if (x1 < _vm->_maze._x1) { // Exit west - _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screen_p - 1; + _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screenPtr - 1; _actListArr[_alNewscrIndex][0]._a2._x = _vm->_maze._x2 - kShiftSize - (x2 - x1); _actListArr[_alNewscrIndex][0]._a2._y = _vm->_hero->_y; _vm->_route->resetRoute(); insertActionList(_alNewscrIndex); } else if (x2 > _vm->_maze._x2) { // Exit east - _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screen_p + 1; + _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screenPtr + 1; _actListArr[_alNewscrIndex][0]._a2._x = _vm->_maze._x1 + kShiftSize; _actListArr[_alNewscrIndex][0]._a2._y = _vm->_hero->_y; _vm->_route->resetRoute(); insertActionList(_alNewscrIndex); } else if (y1 < _vm->_maze._y1 - kShiftSize) { // Exit north - _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screen_p - _vm->_maze._size; + _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screenPtr - _vm->_maze._size; _actListArr[_alNewscrIndex][0]._a2._x = _vm->_maze._x3; _actListArr[_alNewscrIndex][0]._a2._y = _vm->_maze._y2 - kShiftSize - (y2 - y1); _vm->_route->resetRoute(); insertActionList(_alNewscrIndex); } else if (y2 > _vm->_maze._y2 - kShiftSize / 2) { // Exit south - _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screen_p + _vm->_maze._size; + _actListArr[_alNewscrIndex][3]._a8._screenIndex = *_vm->_screenPtr + _vm->_maze._size; _actListArr[_alNewscrIndex][0]._a2._x = _vm->_maze._x4; _actListArr[_alNewscrIndex][0]._a2._y = _vm->_maze._y1 + kShiftSize; _vm->_route->resetRoute(); @@ -1090,10 +1090,10 @@ void Scheduler::restoreSchedulerData(Common::ReadStream *in) { void Scheduler::restoreEvents(Common::ReadStream *f) { debugC(1, kDebugSchedule, "restoreEvents"); - uint32 saveTime = f->readUint32BE(); // time of save - int16 freeIndex = f->readSint16BE(); // Free list index - int16 headIndex = f->readSint16BE(); // Head of list index - int16 tailIndex = f->readSint16BE(); // Tail of list index + uint32 saveTime = f->readUint32BE(); // time of save + int16 freeIndex = f->readSint16BE(); // Free list index + int16 headIndex = f->readSint16BE(); // Head of list index + int16 tailIndex = f->readSint16BE(); // Tail of list index // Restore events indexes to pointers for (int i = 0; i < kMaxEvents; i++) { @@ -1121,8 +1121,8 @@ void Scheduler::restoreEvents(Common::ReadStream *f) { // Adjust times to fit our time uint32 curTime = getTicks(); - Event *wrkEvent = _headEvent; // The earliest event - while (wrkEvent) { // While mature events found + Event *wrkEvent = _headEvent; // The earliest event + while (wrkEvent) { // While mature events found wrkEvent->_time = wrkEvent->_time - saveTime + curTime; wrkEvent = wrkEvent->_nextEvent; } @@ -1140,31 +1140,31 @@ void Scheduler::insertAction(Act *action) { curEvent->_action = action; switch (action->_a0._actType) { // Assign whether local or global case AGSCHEDULE: - curEvent->_localActionFl = false; // Lasts over a new screen + curEvent->_localActionFl = false; // Lasts over a new screen break; // Workaround: When dying, switch to storyMode in order to block the keyboard. case GAMEOVER: _vm->getGameStatus()._storyModeFl = true; // No break on purpose default: - curEvent->_localActionFl = true; // Rest are for current screen only + curEvent->_localActionFl = true; // Rest are for current screen only break; } curEvent->_time = action->_a0._timer + getTicks(); // Convert rel to abs time // Now find the place to insert the event - if (!_tailEvent) { // Empty queue + if (!_tailEvent) { // Empty queue _tailEvent = _headEvent = curEvent; curEvent->_nextEvent = curEvent->_prevEvent = 0; } else { - Event *wrkEvent = _tailEvent; // Search from latest time back + Event *wrkEvent = _tailEvent; // Search from latest time back bool found = false; while (wrkEvent && !found) { - if (wrkEvent->_time <= curEvent->_time) { // Found if new event later + if (wrkEvent->_time <= curEvent->_time) { // Found if new event later found = true; - if (wrkEvent == _tailEvent) // New latest in list + if (wrkEvent == _tailEvent) // New latest in list _tailEvent = curEvent; else wrkEvent->_nextEvent->_prevEvent = curEvent; @@ -1175,8 +1175,8 @@ void Scheduler::insertAction(Act *action) { wrkEvent = wrkEvent->_prevEvent; } - if (!found) { // Must be earliest in list - _headEvent->_prevEvent = curEvent; // So insert as new head + if (!found) { // Must be earliest in list + _headEvent->_prevEvent = curEvent; // So insert as new head curEvent->_nextEvent = _headEvent; curEvent->_prevEvent = 0; _headEvent = curEvent; @@ -1196,106 +1196,106 @@ Event *Scheduler::doAction(Event *curEvent) { Act *action = curEvent->_action; Object *obj1; int dx, dy; - Event *wrkEvent; // Save ev_p->next_p for return + Event *wrkEvent; // Save ev_p->nextEvent for return switch (action->_a0._actType) { - case ANULL: // Big NOP from DEL_EVENTS + case ANULL: // Big NOP from DEL_EVENTS break; - case ASCHEDULE: // act0: Schedule an action list + case ASCHEDULE: // act0: Schedule an action list insertActionList(action->_a0._actIndex); break; - case START_OBJ: // act1: Start an object cycling + case START_OBJ: // act1: Start an object cycling _vm->_object->_objects[action->_a1._objIndex]._cycleNumb = action->_a1._cycleNumb; _vm->_object->_objects[action->_a1._objIndex]._cycling = action->_a1._cycle; break; - case INIT_OBJXY: // act2: Initialize an object + case INIT_OBJXY: // act2: Initialize an object _vm->_object->_objects[action->_a2._objIndex]._x = action->_a2._x; // Coordinates _vm->_object->_objects[action->_a2._objIndex]._y = action->_a2._y; break; - case PROMPT: // act3: Prompt user for key phrase + case PROMPT: // act3: Prompt user for key phrase promptAction(action); break; - case BKGD_COLOR: // act4: Set new background color + case BKGD_COLOR: // act4: Set new background color _vm->_screen->setBackgroundColor(action->_a4._newBackgroundColor); break; - case INIT_OBJVXY: // act5: Initialize an object velocity + case INIT_OBJVXY: // act5: Initialize an object velocity _vm->_object->setVelocity(action->_a5._objIndex, action->_a5._vx, action->_a5._vy); break; - case INIT_CARRY: // act6: Initialize an object + case INIT_CARRY: // act6: Initialize an object _vm->_object->setCarry(action->_a6._objIndex, action->_a6._carriedFl); // carried status break; - case INIT_HF_COORD: // act7: Initialize an object to hero's "feet" coords + case INIT_HF_COORD: // act7: Initialize an object to hero's "feet" coords _vm->_object->_objects[action->_a7._objIndex]._x = _vm->_hero->_x - 1; _vm->_object->_objects[action->_a7._objIndex]._y = _vm->_hero->_y + _vm->_hero->_currImagePtr->_y2 - 1; - _vm->_object->_objects[action->_a7._objIndex]._screenIndex = *_vm->_screen_p; // Don't forget screen! + _vm->_object->_objects[action->_a7._objIndex]._screenIndex = *_vm->_screenPtr; // Don't forget screen! break; - case NEW_SCREEN: // act8: Start new screen + case NEW_SCREEN: // act8: Start new screen newScreen(action->_a8._screenIndex); break; - case INIT_OBJSTATE: // act9: Initialize an object state + case INIT_OBJSTATE: // act9: Initialize an object state _vm->_object->_objects[action->_a9._objIndex]._state = action->_a9._newState; break; - case INIT_PATH: // act10: Initialize an object path and velocity + case INIT_PATH: // act10: Initialize an object path and velocity _vm->_object->setPath(action->_a10._objIndex, (Path) action->_a10._newPathType, action->_a10._vxPath, action->_a10._vyPath); break; - case COND_R: // act11: action lists conditional on object state + case COND_R: // act11: action lists conditional on object state if (_vm->_object->_objects[action->_a11._objIndex]._state == action->_a11._stateReq) insertActionList(action->_a11._actPassIndex); else insertActionList(action->_a11._actFailIndex); break; - case TEXT: // act12: Text box (CF WARN) + case TEXT: // act12: Text box (CF WARN) Utils::notifyBox(_vm->_file->fetchString(action->_a12._stringIndex)); // Fetch string from file break; - case SWAP_IMAGES: // act13: Swap 2 object images + case SWAP_IMAGES: // act13: Swap 2 object images _vm->_object->swapImages(action->_a13._objIndex1, action->_a13._objIndex2); break; - case COND_SCR: // act14: Conditional on current screen + case COND_SCR: // act14: Conditional on current screen if (_vm->_object->_objects[action->_a14._objIndex]._screenIndex == action->_a14._screenReq) insertActionList(action->_a14._actPassIndex); else insertActionList(action->_a14._actFailIndex); break; - case AUTOPILOT: // act15: Home in on a (stationary) object + case AUTOPILOT: // act15: Home in on a (stationary) object _vm->_object->homeIn(action->_a15._objIndex1, action->_a15._objIndex2, action->_a15._dx, action->_a15._dy); break; - case INIT_OBJ_SEQ: // act16: Set sequence number to use + case INIT_OBJ_SEQ: // act16: Set sequence number to use // Note: Don't set a sequence at time 0 of a new screen, it causes // problems clearing the boundary bits of the object! t>0 is safe _vm->_object->_objects[action->_a16._objIndex]._currImagePtr = _vm->_object->_objects[action->_a16._objIndex]._seqList[action->_a16._seqIndex]._seqPtr; break; - case SET_STATE_BITS: // act17: OR mask with curr obj state + case SET_STATE_BITS: // act17: OR mask with curr obj state _vm->_object->_objects[action->_a17._objIndex]._state |= action->_a17._stateMask; break; - case CLEAR_STATE_BITS: // act18: AND ~mask with curr obj state + case CLEAR_STATE_BITS: // act18: AND ~mask with curr obj state _vm->_object->_objects[action->_a18._objIndex]._state &= ~action->_a18._stateMask; break; - case TEST_STATE_BITS: // act19: If all bits set, do apass else afail + case TEST_STATE_BITS: // act19: If all bits set, do apass else afail if ((_vm->_object->_objects[action->_a19._objIndex]._state & action->_a19._stateMask) == action->_a19._stateMask) insertActionList(action->_a19._actPassIndex); else insertActionList(action->_a19._actFailIndex); break; - case DEL_EVENTS: // act20: Remove all events of this action type + case DEL_EVENTS: // act20: Remove all events of this action type delEventType(action->_a20._actTypeDel); break; - case GAMEOVER: // act21: Game over! + case GAMEOVER: // act21: Game over! // NOTE: Must wait at least 1 tick before issuing this action if // any objects are to be made invisible! gameStatus._gameOverFl = true; break; - case INIT_HH_COORD: // act22: Initialize an object to hero's actual coords + case INIT_HH_COORD: // act22: Initialize an object to hero's actual coords _vm->_object->_objects[action->_a22._objIndex]._x = _vm->_hero->_x; _vm->_object->_objects[action->_a22._objIndex]._y = _vm->_hero->_y; - _vm->_object->_objects[action->_a22._objIndex]._screenIndex = *_vm->_screen_p;// Don't forget screen! + _vm->_object->_objects[action->_a22._objIndex]._screenIndex = *_vm->_screenPtr;// Don't forget screen! break; - case EXIT: // act23: Exit game back to DOS + case EXIT: // act23: Exit game back to DOS _vm->endGame(); break; - case BONUS: // act24: Get bonus score for action + case BONUS: // act24: Get bonus score for action processBonus(action->_a24._pointIndex); break; - case COND_BOX: // act25: Conditional on bounding box + case COND_BOX: // act25: Conditional on bounding box obj1 = &_vm->_object->_objects[action->_a25._objIndex]; dx = obj1->_x + obj1->_currImagePtr->_x1; dy = obj1->_y + obj1->_currImagePtr->_y2; @@ -1305,25 +1305,25 @@ Event *Scheduler::doAction(Event *curEvent) { else insertActionList(action->_a25._actFailIndex); break; - case SOUND: // act26: Play a sound (or tune) + case SOUND: // act26: Play a sound (or tune) if (action->_a26._soundIndex < _vm->_tunesNbr) _vm->_sound->playMusic(action->_a26._soundIndex); else _vm->_sound->playSound(action->_a26._soundIndex, kSoundPriorityMedium); break; - case ADD_SCORE: // act27: Add object's value to score + case ADD_SCORE: // act27: Add object's value to score _vm->adjustScore(_vm->_object->_objects[action->_a27._objIndex]._objValue); break; - case SUB_SCORE: // act28: Subtract object's value from score + case SUB_SCORE: // act28: Subtract object's value from score _vm->adjustScore(-_vm->_object->_objects[action->_a28._objIndex]._objValue); break; - case COND_CARRY: // act29: Conditional on object being carried + case COND_CARRY: // act29: Conditional on object being carried if (_vm->_object->isCarried(action->_a29._objIndex)) insertActionList(action->_a29._actPassIndex); else insertActionList(action->_a29._actFailIndex); break; - case INIT_MAZE: // act30: Enable and init maze structure + case INIT_MAZE: // act30: Enable and init maze structure _vm->_maze._enabledFl = true; _vm->_maze._size = action->_a30._mazeSize; _vm->_maze._x1 = action->_a30._x1; @@ -1334,7 +1334,7 @@ Event *Scheduler::doAction(Event *curEvent) { _vm->_maze._x4 = action->_a30._x4; _vm->_maze._firstScreenIndex = action->_a30._firstScreenIndex; break; - case EXIT_MAZE: // act31: Disable maze mode + case EXIT_MAZE: // act31: Disable maze mode _vm->_maze._enabledFl = false; break; case INIT_PRIORITY: @@ -1343,71 +1343,71 @@ Event *Scheduler::doAction(Event *curEvent) { case INIT_SCREEN: _vm->_object->_objects[action->_a33._objIndex]._screenIndex = action->_a33._screenIndex; break; - case AGSCHEDULE: // act34: Schedule a (global) action list + case AGSCHEDULE: // act34: Schedule a (global) action list insertActionList(action->_a34._actIndex); break; - case REMAPPAL: // act35: Remap a palette color + case REMAPPAL: // act35: Remap a palette color _vm->_screen->remapPal(action->_a35._oldColorIndex, action->_a35._newColorIndex); break; - case COND_NOUN: // act36: Conditional on noun mentioned + case COND_NOUN: // act36: Conditional on noun mentioned if (_vm->_parser->isWordPresent(_vm->_text->getNounArray(action->_a36._nounIndex))) insertActionList(action->_a36._actPassIndex); else insertActionList(action->_a36._actFailIndex); break; - case SCREEN_STATE: // act37: Set new screen state + case SCREEN_STATE: // act37: Set new screen state _vm->_screenStates[action->_a37._screenIndex] = action->_a37._newState; break; - case INIT_LIPS: // act38: Position lips on object + case INIT_LIPS: // act38: Position lips on object _vm->_object->_objects[action->_a38._lipsObjIndex]._x = _vm->_object->_objects[action->_a38._objIndex]._x + action->_a38._dxLips; _vm->_object->_objects[action->_a38._lipsObjIndex]._y = _vm->_object->_objects[action->_a38._objIndex]._y + action->_a38._dyLips; - _vm->_object->_objects[action->_a38._lipsObjIndex]._screenIndex = *_vm->_screen_p; // Don't forget screen! + _vm->_object->_objects[action->_a38._lipsObjIndex]._screenIndex = *_vm->_screenPtr; // Don't forget screen! _vm->_object->_objects[action->_a38._lipsObjIndex]._cycling = kCycleForward; break; - case INIT_STORY_MODE: // act39: Init story_mode flag + case INIT_STORY_MODE: // act39: Init story_mode flag // This is similar to the QUIET path mode, except that it is // independant of it and it additionally disables the ">" prompt gameStatus._storyModeFl = action->_a39._storyModeFl; break; - case WARN: // act40: Text box (CF TEXT) + case WARN: // act40: Text box (CF TEXT) Utils::notifyBox(_vm->_file->fetchString(action->_a40._stringIndex)); break; - case COND_BONUS: // act41: Perform action if got bonus + case COND_BONUS: // act41: Perform action if got bonus if (_points[action->_a41._bonusIndex]._scoredFl) insertActionList(action->_a41._actPassIndex); else insertActionList(action->_a41._actFailIndex); break; - case TEXT_TAKE: // act42: Text box with "take" message + case TEXT_TAKE: // act42: Text box with "take" message Utils::notifyBox(Common::String::format(TAKE_TEXT, _vm->_text->getNoun(_vm->_object->_objects[action->_a42._objIndex]._nounIndex, TAKE_NAME))); break; - case YESNO: // act43: Prompt user for Yes or No + case YESNO: // act43: Prompt user for Yes or No if (Utils::yesNoBox(_vm->_file->fetchString(action->_a43._promptIndex))) insertActionList(action->_a43._actYesIndex); else insertActionList(action->_a43._actNoIndex); break; - case STOP_ROUTE: // act44: Stop any route in progress + case STOP_ROUTE: // act44: Stop any route in progress _vm->_route->resetRoute(); break; - case COND_ROUTE: // act45: Conditional on route in progress + case COND_ROUTE: // act45: Conditional on route in progress if (_vm->_route->getRouteIndex() >= action->_a45._routeIndex) insertActionList(action->_a45._actPassIndex); else insertActionList(action->_a45._actFailIndex); break; - case INIT_JUMPEXIT: // act46: Init status.jumpexit flag + case INIT_JUMPEXIT: // act46: Init status.jumpexit flag // This is to allow left click on exit to get there immediately // For example the plane crash in Hugo2 where hero is invisible // Couldn't use INVISIBLE flag since conflicts with boat in Hugo1 _vm->_mouse->setJumpExitFl(action->_a46._jumpExitFl); break; - case INIT_VIEW: // act47: Init object._viewx, viewy, dir + case INIT_VIEW: // act47: Init object._viewx, viewy, dir _vm->_object->_objects[action->_a47._objIndex]._viewx = action->_a47._viewx; _vm->_object->_objects[action->_a47._objIndex]._viewy = action->_a47._viewy; _vm->_object->_objects[action->_a47._objIndex]._direction = action->_a47._direction; break; - case INIT_OBJ_FRAME: // act48: Set seq,frame number to use + case INIT_OBJ_FRAME: // act48: Set seq,frame number to use // Note: Don't set a sequence at time 0 of a new screen, it causes // problems clearing the boundary bits of the object! t>0 is safe _vm->_object->_objects[action->_a48._objIndex]._currImagePtr = _vm->_object->_objects[action->_a48._objIndex]._seqList[action->_a48._seqIndex]._seqPtr; @@ -1424,11 +1424,11 @@ Event *Scheduler::doAction(Event *curEvent) { } if (action->_a0._actType == NEW_SCREEN) { // New_screen() deletes entire list - return 0; // next_p = 0 since list now empty + return 0; // nextEvent = 0 since list now empty } else { wrkEvent = curEvent->_nextEvent; - delQueue(curEvent); // Return event to free list - return wrkEvent; // Return next event ptr + delQueue(curEvent); // Return event to free list + return wrkEvent; // Return next event ptr } } @@ -1444,9 +1444,9 @@ Event *Scheduler::doAction(Event *curEvent) { void Scheduler::delQueue(Event *curEvent) { debugC(4, kDebugSchedule, "delQueue()"); - if (curEvent == _headEvent) { // If p was the head ptr - _headEvent = curEvent->_nextEvent; // then make new head_p - } else { // Unlink p + if (curEvent == _headEvent) { // If p was the head ptr + _headEvent = curEvent->_nextEvent; // then make new head_p + } else { // Unlink p curEvent->_prevEvent->_nextEvent = curEvent->_nextEvent; if (curEvent->_nextEvent) curEvent->_nextEvent->_prevEvent = curEvent->_prevEvent; @@ -1455,12 +1455,12 @@ void Scheduler::delQueue(Event *curEvent) { } if (_headEvent) - _headEvent->_prevEvent = 0; // Mark end of list + _headEvent->_prevEvent = 0; // Mark end of list else - _tailEvent = 0; // Empty queue + _tailEvent = 0; // Empty queue - curEvent->_nextEvent = _freeEvent; // Return p to free list - if (_freeEvent) // Special case, if free list was empty + curEvent->_nextEvent = _freeEvent; // Return p to free list + if (_freeEvent) // Special case, if free list was empty _freeEvent->_prevEvent = curEvent; _freeEvent = curEvent; } @@ -1470,10 +1470,10 @@ void Scheduler::delQueue(Event *curEvent) { */ void Scheduler::delEventType(const Action _actTypeDel) { // Note: actions are not deleted here, simply turned into NOPs! - Event *wrkEvent = _headEvent; // The earliest event + Event *wrkEvent = _headEvent; // The earliest event Event *saveEvent; - while (wrkEvent) { // While events found in list + while (wrkEvent) { // While events found in list saveEvent = wrkEvent->_nextEvent; if (wrkEvent->_action->_a20._actType == _actTypeDel) delQueue(wrkEvent); @@ -1524,11 +1524,11 @@ uint32 Scheduler_v1d::getTicks() { void Scheduler_v1d::runScheduler() { debugC(6, kDebugSchedule, "runScheduler"); - uint32 ticker = getTicks(); // The time now, in ticks - Event *curEvent = _headEvent; // The earliest event + uint32 ticker = getTicks(); // The time now, in ticks + Event *curEvent = _headEvent; // The earliest event - while (curEvent && (curEvent->_time <= ticker)) // While mature events found - curEvent = doAction(curEvent); // Perform the action (returns next_p) + while (curEvent && (curEvent->_time <= ticker)) // While mature events found + curEvent = doAction(curEvent); // Perform the action (returns nextEvent) } void Scheduler_v1d::promptAction(Act *action) { @@ -1583,7 +1583,7 @@ void Scheduler_v2d::promptAction(Act *action) { debug(1, "doAction(act3), expecting answer %s", _vm->_file->fetchString(action->_a3._responsePtr[0])); bool found = false; - const char *tmpStr; // General purpose string ptr + const char *tmpStr; // General purpose string ptr for (int dx = 0; !found && (action->_a3._responsePtr[dx] != -1); dx++) { tmpStr = _vm->_file->fetchString(action->_a3._responsePtr[dx]); @@ -1638,12 +1638,12 @@ uint32 Scheduler_v1w::getTicks() { void Scheduler_v1w::runScheduler() { debugC(6, kDebugSchedule, "runScheduler"); - uint32 ticker = getTicks(); // The time now, in ticks - Event *curEvent = _headEvent; // The earliest event + uint32 ticker = getTicks(); // The time now, in ticks + Event *curEvent = _headEvent; // The earliest event - while (curEvent && (curEvent->_time <= ticker)) // While mature events found - curEvent = doAction(curEvent); // Perform the action (returns next_p) + while (curEvent && (curEvent->_time <= ticker)) // While mature events found + curEvent = doAction(curEvent); // Perform the action (returns nextEvent) - _vm->getGameStatus()._tick++; // Accessed elsewhere via getTicks() + _vm->getGameStatus()._tick++; // Accessed elsewhere via getTicks() } } // End of namespace Hugo diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp index a8b4759d9b..aefa03cd5e 100644 --- a/engines/hugo/sound.cpp +++ b/engines/hugo/sound.cpp @@ -174,7 +174,7 @@ void SoundHandler::toggleSound() { _vm->_config._soundFl = !_vm->_config._soundFl; } -void SoundHandler::playMIDI(sound_pt seqPtr, uint16 size) { +void SoundHandler::playMIDI(SoundPtr seqPtr, uint16 size) { _midiPlayer->play(seqPtr, size); } @@ -182,7 +182,7 @@ void SoundHandler::playMIDI(sound_pt seqPtr, uint16 size) { * Read a tune sequence from the sound database and start playing it */ void SoundHandler::playMusic(int16 tune) { - sound_pt seqPtr; // Sequence data from file + SoundPtr seqPtr; // Sequence data from file uint16 size; // Size of sequence data if (_vm->_config._musicFl) { @@ -198,9 +198,9 @@ void SoundHandler::playMusic(int16 tune) { * Override currently playing sound only if lower or same priority */ void SoundHandler::playSound(int16 sound, const byte priority) { - // uint32 dwVolume; // Left, right volume of sound - sound_pt sound_p; // Sound data - uint16 size; // Size of data + // uint32 dwVolume; // Left, right volume of sound + SoundPtr soundPtr; // Sound data + uint16 size; // Size of data // Sound disabled if (!_vm->_config._soundFl || !_vm->_mixer->isReady()) @@ -210,10 +210,10 @@ void SoundHandler::playSound(int16 sound, const byte priority) { _curPriority = priority; // Get sound data - if ((sound_p = _vm->_file->getSound(sound, &size)) == 0) + if ((soundPtr = _vm->_file->getSound(sound, &size)) == 0) return; - Audio::AudioStream *stream = Audio::makeRawStream(sound_p, size, 11025, Audio::FLAG_UNSIGNED); + Audio::AudioStream *stream = Audio::makeRawStream(soundPtr, size, 11025, Audio::FLAG_UNSIGNED); _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle, stream); } diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h index cb6d4e3168..b00d93eeb1 100644 --- a/engines/hugo/sound.h +++ b/engines/hugo/sound.h @@ -97,7 +97,7 @@ private: void stopSound(); void stopMusic(); - void playMIDI(sound_pt seq_p, uint16 size); + void playMIDI(SoundPtr seqPtr, uint16 size); }; } // End of namespace Hugo -- cgit v1.2.3