diff options
Diffstat (limited to 'engines/sherlock/tattoo')
28 files changed, 167 insertions, 167 deletions
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp index 3131df7649..31a65783e3 100644 --- a/engines/sherlock/tattoo/tattoo.cpp +++ b/engines/sherlock/tattoo/tattoo.cpp @@ -63,7 +63,7 @@ void TattooEngine::initialize() { // Add some more files to the cache _res->addToCache("walk.lib"); - + // Set up list of people TattooFixedText &fixedText = *(TattooFixedText *)_fixedText; const char *peopleNamePtr = nullptr; @@ -122,7 +122,7 @@ void TattooEngine::startScene() { // Darts Board minigame _darts.playDarts(GAME_CRICKET); break; - + case 102: // Darts Board minigame _darts.playDarts(GAME_301); diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp index cbc3ea1fe8..b3fa8cda9e 100644 --- a/engines/sherlock/tattoo/tattoo_darts.cpp +++ b/engines/sherlock/tattoo/tattoo_darts.cpp @@ -121,7 +121,7 @@ void Darts::playDarts(GameType gameType) { numHits = 1; if (numHits > 3) numHits = 3; - + lastDart = lastDart & 0xffff; updateCricketScore(playerNum, lastDart, numHits); score = (playerNum == 0) ? _score1 : _score2; @@ -134,7 +134,7 @@ void Darts::playDarts(GameType gameType) { done = true; playerNum = 0; } - + if (_gameType == GAME_301) { if (playerNum == 0) @@ -217,7 +217,7 @@ void Darts::playDarts(GameType gameType) { } if (score != 0 && playerNum == 0 && !gameOver) - screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing * 3), 0, + screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing * 3), 0, "%s", FIXED(DartsPressKey)); if (gameOver) { @@ -388,14 +388,14 @@ void Darts::showNames(int playerNum) { color = playerNum == 0 ? PLAYER_COLOR : DART_COLOR_FORE; screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y), 0, "%s", FIXED(DartsPlayerHolmes)); - screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + _spacing + 1, + screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + _spacing + 1, STATUS_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color); screen.fillRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + _spacing + 1, STATUS_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color); color = playerNum == 1 ? PLAYER_COLOR : DART_COLOR_FORE; screen.print(Common::Point(STATUS2_INFO_X, STATUS_INFO_Y), 0, "%s", _opponent.c_str()); - screen._backBuffer1.fillRect(Common::Rect(STATUS2_INFO_X, STATUS_INFO_Y + _spacing + 1, + screen._backBuffer1.fillRect(Common::Rect(STATUS2_INFO_X, STATUS_INFO_Y + _spacing + 1, STATUS2_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color); screen.fillRect(Common::Rect(STATUS2_INFO_X, STATUS_INFO_Y + _spacing + 1, STATUS2_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color); @@ -449,7 +449,7 @@ void Darts::showStatus(int playerNum) { } screen.SHblitFrom(screen._backBuffer1, Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 10), - Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, STATUS_INFO_X + STATUS_INFO_WIDTH, + Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, STATUS_INFO_X + STATUS_INFO_WIDTH, STATUS_INFO_Y + STATUS_INFO_HEIGHT - 10)); } @@ -674,9 +674,9 @@ void Darts::drawDartThrow(const Common::Point &dartPos, int computer) { screen.slamArea(drawPos.x, drawPos.y, xSize, ySize); if (oldDrawPos.x != -1) // Flush the erased dart area - screen.slamArea(oldDrawPos.x, oldDrawPos.y, oldxSize, oldySize); + screen.slamArea(oldDrawPos.x, oldDrawPos.y, oldxSize, oldySize); - screen._backBuffer1.SHblitFrom(screen._backBuffer2, Common::Point(drawPos.x, drawPos.y), + screen._backBuffer1.SHblitFrom(screen._backBuffer2, Common::Point(drawPos.x, drawPos.y), Common::Rect(drawPos.x, drawPos.y, drawPos.x + xSize, drawPos.y + ySize)); oldDrawPos.x = drawPos.x; @@ -745,7 +745,7 @@ void Darts::drawDartThrow(const Common::Point &dartPos, int computer) { screen.slamArea(oldDrawPos.x, oldDrawPos.y, oldxSize, oldySize); if (idx != 23) - screen._backBuffer1.SHblitFrom(screen._backBuffer2, drawPos, + screen._backBuffer1.SHblitFrom(screen._backBuffer2, drawPos, Common::Rect(drawPos.x, drawPos.y, drawPos.x + xSize, drawPos.y + ySize)); // erase dart events.wait(1); @@ -805,7 +805,7 @@ int Darts::findNumberOnBoard(int aim, Common::Point &pt) { } } } - + pt = convertFromScreenToScoreCoords(pt); if (aim == 3) @@ -832,7 +832,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) { if (_gameType == GAME_301) { // Try to hit number - aim = score; + aim = score; if(score > 60) shootBull = true; } else { @@ -855,7 +855,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) { if (!cricketaimset) { // Everything is closed // just in case we don't get set in loop below, which should never happen - aim = 14; + aim = 14; for (int idx = 0; idx < 7; ++idx) { if (_cricketScore[playerNum^1][idx] < 3) { // Opponent has this open @@ -896,7 +896,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) { // the higher the level, the more accurate the throw int v = _vm->getRandomNumber(9); - v += _level * 2; + v += _level * 2; if (v <= 2) { targetPos.x += _vm->getRandomNumber(70) - 35; @@ -981,12 +981,12 @@ int Darts::throwDart(int dartNum, int computer) { // Copy power bars to the secondary back buffer screen._backBuffer2.SHblitFrom(screen._backBuffer1, Common::Point(DART_BAR_VX - 1, DART_HEIGHT_Y - 1), - Common::Rect(DART_BAR_VX - 1, DART_HEIGHT_Y - 1, DART_BAR_VX - 1 + 10, + Common::Rect(DART_BAR_VX - 1, DART_HEIGHT_Y - 1, DART_BAR_VX - 1 + 10, DART_HEIGHT_Y - 1 + DART_BAR_SIZE + 2)); Common::Point dartPos(DARTBOARD_TOTALLEFT + horiz*DARTBOARD_TOTALX / 100, DARTBOARD_TOTALTOP + height * DARTBOARD_TOTALY / 100); - + dartPos.x += 2 - _vm->getRandomNumber(4); dartPos.y += 2 - _vm->getRandomNumber(4); diff --git a/engines/sherlock/tattoo/tattoo_darts.h b/engines/sherlock/tattoo/tattoo_darts.h index ab6b1c8204..94402a5b1b 100644 --- a/engines/sherlock/tattoo/tattoo_darts.h +++ b/engines/sherlock/tattoo/tattoo_darts.h @@ -103,7 +103,7 @@ private: int doPowerBar(const Common::Point &pt, byte color, int goToPower, int orientation); /** - * This is similar to doPowerBar, except it draws the player's hand moving across the + * This is similar to doPowerBar, except it draws the player's hand moving across the * bottom of the screen to indicate the positioning of the darts */ int drawHand(int goToPower, int computer); diff --git a/engines/sherlock/tattoo/tattoo_inventory.h b/engines/sherlock/tattoo/tattoo_inventory.h index a18324b785..0a46045d4b 100644 --- a/engines/sherlock/tattoo/tattoo_inventory.h +++ b/engines/sherlock/tattoo/tattoo_inventory.h @@ -38,7 +38,7 @@ public: * Load the list of names the inventory items correspond to, if not already loaded, * and then calls loadGraphics to load the associated graphics */ - virtual void loadInv(); + virtual void loadInv(); }; } // End of namespace Tattoo diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp index 23e8bd9739..e432c255d8 100644 --- a/engines/sherlock/tattoo/tattoo_map.cpp +++ b/engines/sherlock/tattoo/tattoo_map.cpp @@ -70,7 +70,7 @@ int TattooMap::show() { } if (music._musicOn) { - // See if Holmes or Watson is the active character + // See if Holmes or Watson is the active character Common::String song; if (_vm->readFlags(FLAG_PLAYER_IS_HOLMES)) // Player is Holmes @@ -86,7 +86,7 @@ int TattooMap::show() { } screen.initPaletteFade(1364485); - + // Load the custom mouse cursors for the map ImageFile cursors("omouse.vgs"); events.setCursor(cursors[0]._frame); @@ -298,7 +298,7 @@ void TattooMap::loadData() { void TattooMap::drawMapIcons() { Debugger &debugger = *_vm->_debugger; Screen &screen = *_vm->_screen; - + for (uint idx = 0; idx < _data.size(); ++idx) { if (debugger._showAllLocations != LOC_DISABLED) _vm->setFlagsDirect(idx + 1); @@ -344,7 +344,7 @@ void TattooMap::checkMapNames(bool slamIt) { const Common::String &desc = _data[_bgFound]._description; _mapTooltip.setText(desc); } - + _oldBgFound = _bgFound; } diff --git a/engines/sherlock/tattoo/tattoo_map.h b/engines/sherlock/tattoo/tattoo_map.h index 1c7173bdb0..df3e3b3def 100644 --- a/engines/sherlock/tattoo/tattoo_map.h +++ b/engines/sherlock/tattoo/tattoo_map.h @@ -51,7 +51,7 @@ private: int _bgFound, _oldBgFound; WidgetMapTooltip _mapTooltip; Common::Point _targetScroll; - + /** * Load data needed for the map */ diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index 65cc283b66..fc3c2e6574 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -197,7 +197,7 @@ void TattooPerson::adjustSprite() { // See if the player has come to a stop after clicking on an Arrow zone to leave the scene. // If so, this will set up the exit information for the scene transition if (!_walkCount && ui._exitZone != -1 && scene._walkedInScene && scene._goToScene == -1 && - !_description.compareToIgnoreCase(people[HOLMES]._description)) { + !_description.compareToIgnoreCase(people[HOLMES]._description)) { Exit &exit = scene._exits[ui._exitZone]; scene._goToScene = exit._scene; @@ -221,7 +221,7 @@ void TattooPerson::gotoStand() { _walkCount = 0; int oldFacing = _sequenceNumber; - // If the person was talking or listening, just return it to the standing sequence + // If the person was talking or listening, just return it to the standing sequence // in the direction they were pointing if (_sequenceNumber >= TALK_UPRIGHT && _sequenceNumber <= LISTEN_UPLEFT) { switch (_sequenceNumber) { @@ -269,7 +269,7 @@ void TattooPerson::gotoStand() { return; } - // If the sprite that is stopping is an NPC and he is supposed to face a certain direction + // If the sprite that is stopping is an NPC and he is supposed to face a certain direction // when he stops, set that direction here int npc = -1; for (int idx = 1; idx < MAX_CHARACTERS; ++idx) { @@ -317,7 +317,7 @@ void TattooPerson::gotoStand() { } } - // Only restart the frame number at 0 if the new sequence is different from the last sequence + // Only restart the frame number at 0 if the new sequence is different from the last sequence // so we don't let Holmes repeat standing. if (_oldWalkSequence != -1) { if (_seqTo) { @@ -356,7 +356,7 @@ void TattooPerson::setWalking() { Common::Point diagSpeed(MAX(WALK_SPEED_DIAG_X[scene._currentScene - 1] * SCALE_THRESHOLD / scaleVal, 2), MAX((WALK_SPEED_Y[scene._currentScene - 1] - 2) * SCALE_THRESHOLD / scaleVal, 2)); - // If the player is already close to the given destination that no walking is needed, + // If the player is already close to the given destination that no walking is needed, // move to the next straight line segment in the overall walking route, if there is one for (;;) { if (_centerWalk || !_walkTo.empty()) { @@ -505,7 +505,7 @@ void TattooPerson::setWalking() { if (!_walkCount && _walkTo.empty()) gotoStand(); - // If the sequence is the same as when we started, then Holmes was standing still and we're trying + // If the sequence is the same as when we started, then Holmes was standing still and we're trying // to re-stand him, so reset Holmes' rame to the old frame number from before it was reset to 0 if (_sequenceNumber == oldDirection) _frameNumber = oldFrame; @@ -536,7 +536,7 @@ void TattooPerson::walkToCoords(const Point32 &destPos, int destDir) { _centerWalk = false; // Only move the person if they're going an appreciable distance - if (ABS(_walkDest.x - (_position.x / FIXED_INT_MULTIPLIER)) > 8 || + if (ABS(_walkDest.x - (_position.x / FIXED_INT_MULTIPLIER)) > 8 || ABS(_walkDest.y - (_position.y / FIXED_INT_MULTIPLIER)) > 4) { goAllTheWay(); @@ -631,7 +631,7 @@ void TattooPerson::updateNPC() { // Now see if we need to update the NPC's frame sequence so that he faces Holmes if (_lookHolmes) { - // See where Holmes is with respect to the NPC (x coordinate) + // See where Holmes is with respect to the NPC (x coordinate) _npcFacing = (people[HOLMES]._position.x < _position.x) ? STOP_LEFT : STOP_RIGHT; // See where Holmes is with respect to the NPC (y coordinate) @@ -643,7 +643,7 @@ void TattooPerson::updateNPC() { _npcFacing = (_npcFacing == STOP_RIGHT) ? STOP_DOWNRIGHT : STOP_DOWNLEFT; } - // See if we need to set the old_walk_sequence so the NPC will put his arms + // See if we need to set the old_walk_sequence so the NPC will put his arms // up if he turns another way if (_sequenceNumber != _npcFacing) _oldWalkSequence = _sequenceNumber; @@ -660,7 +660,7 @@ void TattooPerson::updateNPC() { if (!_npcPath[_npcIndex]) _npcIndex = 0; - // The NPC is stopped and any pause he was doing is done. We can now see what + // The NPC is stopped and any pause he was doing is done. We can now see what // the next command in the NPC path is. // Scan Past any NPC Path Labels since they do nothing except mark places for If's and Goto's @@ -725,7 +725,7 @@ void TattooPerson::updateNPC() { } case NPCPATH_TAKE_NOTES: - // Set the NPC to Pause where he is and set his frame sequences + // Set the NPC to Pause where he is and set his frame sequences // so he takes notes while he's paused _npcPause = (_npcPath[_npcIndex + 1] - 1) * 256 + _npcPath[_npcIndex + 2] - 1; _npcIndex += 3; @@ -875,7 +875,7 @@ Common::Point TattooPerson::getSourcePoint() const { TattooScene &scene = *(TattooScene *)_vm->_scene; int scaleVal = scene.getScaleVal(_position); - return Common::Point(_position.x / FIXED_INT_MULTIPLIER + + return Common::Point(_position.x / FIXED_INT_MULTIPLIER + (_imageFrame ? _imageFrame->sDrawXSize(scaleVal) / 2 : 0), _position.y / FIXED_INT_MULTIPLIER); } @@ -1028,7 +1028,7 @@ void TattooPerson::walkHolmesToNPC() { // Clear the path variables memset(_npcPath, 0, 100); - + // Set the NPC path so he pauses for 250 while looking at Holmes _npcPath[0] = 6; _npcPath[1] = 1; @@ -1426,7 +1426,7 @@ bool TattooPeople::loadWalk() { // Load the walk sequence data Common::SeekableReadStream *stream = res.load(fname, _useWalkLib ? "walk.lib" : "vgs.lib"); - + person._walkSequences.resize(stream->readByte()); for (uint seqNum = 0; seqNum < person._walkSequences.size(); ++seqNum) diff --git a/engines/sherlock/tattoo/tattoo_people.h b/engines/sherlock/tattoo/tattoo_people.h index c844d86e19..1517084c1c 100644 --- a/engines/sherlock/tattoo/tattoo_people.h +++ b/engines/sherlock/tattoo/tattoo_people.h @@ -64,7 +64,7 @@ enum TattooSequences { TALK_UPLEFT = 21, // NPC Listen Sequence Numbers - LISTEN_UPRIGHT = 22, + LISTEN_UPRIGHT = 22, LISTEN_RIGHT = 23, LISTEN_DOWNRIGHT = 24, LISTEN_DOWNLEFT = 25, @@ -160,7 +160,7 @@ public: * This means that the index must be decremented by 3 * 2) The NPC was in route to a position * He must be set to walk to that position again. This is done by moving the path index - * so that it points to the code that set the NPC walking there in the first place. + * so that it points to the code that set the NPC walking there in the first place. * The regular calls to updateNPC will handle the rest */ void pullNPCPath(); @@ -262,10 +262,10 @@ public: virtual const Common::Point restrictToZone(int zoneId, const Common::Point &destPos); /** - * If the specified speaker is a background object, it will set it so that it uses - * the Listen Sequence (specified by the sequence number). If the current sequence - * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object - * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code, + * If the specified speaker is a background object, it will set it so that it uses + * the Listen Sequence (specified by the sequence number). If the current sequence + * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object + * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code, * the Listen Sequence will begin immediately. * @param speaker Who is speaking * @param sequenceNum Which listen sequence to use diff --git a/engines/sherlock/tattoo/tattoo_resources.cpp b/engines/sherlock/tattoo/tattoo_resources.cpp index 4b73356d58..6247750911 100644 --- a/engines/sherlock/tattoo/tattoo_resources.cpp +++ b/engines/sherlock/tattoo/tattoo_resources.cpp @@ -27,7 +27,7 @@ namespace Sherlock { namespace Tattoo { -const PeopleData PEOPLE_DATA[TATTOO_MAX_PEOPLE] = { +const PeopleData PEOPLE_DATA[TATTOO_MAX_PEOPLE] = { { "HOLM", kFixedText_People_SherlockHolmes }, { "WATS", kFixedText_People_DrWatson }, { "HUDS", kFixedText_People_MrsHudson }, diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp index 00015cb189..628e8a3b7a 100644 --- a/engines/sherlock/tattoo/tattoo_scene.cpp +++ b/engines/sherlock/tattoo/tattoo_scene.cpp @@ -49,7 +49,7 @@ struct ShapeEntry { _shape(nullptr), _person(person), _yp(yp), _isAnimation(false), _ordering(ordering) {} ShapeEntry(Object *shape, int yp, int ordering) : _shape(shape), _person(nullptr), _yp(yp), _isAnimation(false), _ordering(ordering) {} - ShapeEntry(int yp, int ordering) : + ShapeEntry(int yp, int ordering) : _shape(nullptr), _person(nullptr), _yp(yp), _isAnimation(true), _ordering(ordering) {} }; typedef Common::List<ShapeEntry> ShapeList; @@ -99,7 +99,7 @@ bool TattooScene::loadScene(const Common::String &filename) { // If it's a new song, then start it up if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) { - // WORKAROUND: Stop playing music after Diogenes fire scene in the intro, + // WORKAROUND: Stop playing music after Diogenes fire scene in the intro, // since it overlaps slightly into the next scene if (talk._scriptName == "prol80p" && _currentScene == 80) { music.stopMusic(); @@ -361,7 +361,7 @@ void TattooScene::doBgAnim() { if (people[idx]._type == CHARACTER) people[idx].checkSprite(); } - + for (uint idx = 0; idx < _bgShapes.size(); ++idx) { if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE) _bgShapes[idx].checkObject(); @@ -539,10 +539,10 @@ void TattooScene::doBgAnimDrawSprites() { if (obj._type == ACTIVE_BG_SHAPE || obj._type == REMOVE) { if (_goToScene == -1) { if (obj._scaleVal == SCALE_THRESHOLD) - screen.flushImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y, + screen.flushImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y, &obj._oldSize.x, &obj._oldSize.y); else - screen.flushScaleImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y, + screen.flushScaleImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y, &obj._oldSize.x, &obj._oldSize.y, obj._scaleVal); if (obj._type == REMOVE) @@ -595,7 +595,7 @@ int TattooScene::getScaleVal(const Point32 &pt) { } } - // If it wasn't found, we may be off screen to the left or right, so find the scale zone + // If it wasn't found, we may be off screen to the left or right, so find the scale zone // that would apply to the y val passed in disregarding the x if (!found) { for (uint idx = 0; idx < _scaleZones.size() && !found; ++idx) { @@ -659,7 +659,7 @@ int TattooScene::startCAnim(int cAnimNum, int playRate) { if (ui._windowOpen) ui.banishWindow(); - + // Open up the room resource file and get the data for the animation Common::SeekableReadStream *stream = res.load(_roomFilename); stream->seek(44 + cAnimNum * 4); @@ -768,7 +768,7 @@ int TattooScene::findBgShape(const Common::Point &pt) { for (int idx = (int)_bgShapes.size() - 1; idx >= 0 && result == -1; --idx) { Object &o = _bgShapes[idx]; - if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN && + if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN && (o._aType <= PERSON || (ui._menuMode == LAB_MODE && o._aType == SOLID))) { if (o.getNewBounds().contains(pt)) result = idx; diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp index e6b9a9627e..8eda7368ea 100644 --- a/engines/sherlock/tattoo/tattoo_talk.cpp +++ b/engines/sherlock/tattoo/tattoo_talk.cpp @@ -34,7 +34,7 @@ namespace Tattoo { static const uint8 DIRECTION_CONVERSION[] = { WALK_RIGHT, WALK_DOWN, WALK_LEFT, WALK_UP, STOP_RIGHT, STOP_DOWN, STOP_LEFT, STOP_UP, - WALK_UPRIGHT, WALK_DOWNRIGHT, WALK_UPLEFT, WALK_DOWNLEFT, STOP_UPRIGHT, STOP_UPLEFT, + WALK_UPRIGHT, WALK_DOWNRIGHT, WALK_UPLEFT, WALK_DOWNLEFT, STOP_UPRIGHT, STOP_UPLEFT, STOP_DOWNRIGHT, STOP_DOWNLEFT }; @@ -254,7 +254,7 @@ OpcodeReturn TattooTalk::cmdSwitchSpeaker(const byte *&str) { return RET_EXIT; ui.clearWindow(); - + _yp = screen.fontHeight() + 11; _charCount = _line = 0; @@ -267,7 +267,7 @@ OpcodeReturn TattooTalk::cmdSwitchSpeaker(const byte *&str) { return RET_SUCCESS; } -OpcodeReturn TattooTalk::cmdMouseOnOff(const byte *&str) { +OpcodeReturn TattooTalk::cmdMouseOnOff(const byte *&str) { Events &events = *_vm->_events; bool mouseOn = *++str == 2; if (mouseOn) @@ -286,7 +286,7 @@ OpcodeReturn TattooTalk::cmdWalkHolmesToCoords(const byte *&str) { // Negative X xp = -1 * (xp - 16384); int yp = (str[2] - 1) * 256 + str[3] - 1; - + people[HOLMES].walkToCoords(Point32(xp * FIXED_INT_MULTIPLIER, yp * FIXED_INT_MULTIPLIER), DIRECTION_CONVERSION[str[4] - 1]); @@ -352,7 +352,7 @@ OpcodeReturn TattooTalk::cmdNPCLabelGoto(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -371,7 +371,7 @@ OpcodeReturn TattooTalk::cmdNPCLabelIfFlagGoto(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -392,7 +392,7 @@ OpcodeReturn TattooTalk::cmdNPCLabelSet(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -413,7 +413,7 @@ OpcodeReturn TattooTalk::cmdPassword(const byte *&str) { return RET_EXIT; } -OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { +OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { Music &music = *_vm->_music; Common::String currentSong = music._currentSongName; @@ -498,7 +498,7 @@ OpcodeReturn TattooTalk::cmdSetNPCOff(const byte *&str) { return RET_SUCCESS; } -OpcodeReturn TattooTalk::cmdSetNPCOn(const byte *&str) { +OpcodeReturn TattooTalk::cmdSetNPCOn(const byte *&str) { TattooPeople &people = *(TattooPeople *)_vm->_people; int npcNum = *++str; people[npcNum]._type = CHARACTER; @@ -510,7 +510,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathDest(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -532,7 +532,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPause(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -553,7 +553,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPauseTakingNotes(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -574,7 +574,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPauseLookingHolmes(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -600,7 +600,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPosition(const byte *&str) { if (posX > 16384) posX = -1 * (posX - 16384); int posY = (str[2] - 1) * 256 + str[3] - 1; - + person._position = Point32(posX * FIXED_INT_MULTIPLIER, posY * FIXED_INT_MULTIPLIER); if (person._seqTo && person._walkLoaded) { person._walkSequences[person._sequenceNumber]._sequences[person._frameNumber] = person._seqTo; @@ -637,7 +637,7 @@ OpcodeReturn TattooTalk::cmdSetNPCTalkFile(const byte *&str) { int npcNum = *++str; TattooPeople &people = *(TattooPeople *)_vm->_people; TattooPerson &person = people[npcNum]; - + if (person._resetNPCPath) { person._npcIndex = person._npcPause = 0; person._resetNPCPath = false; @@ -691,7 +691,7 @@ OpcodeReturn TattooTalk::cmdSetNPCVerbScript(const byte *&str) { int verbNum = *++str - 1; TattooPeople &people = *(TattooPeople *)_vm->_people; UseType &useType = people[npcNum]._use[verbNum]; - + Common::String &name = useType._names[0]; name = "*C"; @@ -775,7 +775,7 @@ OpcodeReturn TattooTalk::cmdSetTalkSequence(const byte *&str) { people.setTalkSequence(speaker, sequenceNumber); else people.setListenSequence(speaker, sequenceNumber); - + str += 2; return RET_SUCCESS; @@ -785,7 +785,7 @@ OpcodeReturn TattooTalk::cmdSetWalkControl(const byte *&str) { TattooPeople &people = *(TattooPeople *)_vm->_people; ++str; people._walkControl = str[0] - 1; - + return RET_SUCCESS; } @@ -958,7 +958,7 @@ void TattooTalk::pullSequence(int slot) { // Check for an entry in this slot if (seq._obj) { Object &o = *seq._obj; - + // See if we're not supposed to restore it until an Allow Talk Interrupt if (slot == -1 && seq._obj->hasAborts()) { seq._obj->_gotoSeq = -1; diff --git a/engines/sherlock/tattoo/tattoo_talk.h b/engines/sherlock/tattoo/tattoo_talk.h index 9b010513dc..b1e294725d 100644 --- a/engines/sherlock/tattoo/tattoo_talk.h +++ b/engines/sherlock/tattoo/tattoo_talk.h @@ -103,7 +103,7 @@ protected: public: TattooTalk(SherlockEngine *vm); virtual ~TattooTalk() {} - + /** * Called whenever a conversation or item script needs to be run. For standard conversations, * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index 677a662535..1cb0220bba 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -42,7 +42,7 @@ bool WidgetList::contains(const WidgetBase *item) const { /*-------------------------------------------------------------------------*/ TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm), - _inventoryWidget(vm), _messageWidget(vm), _textWidget(vm), _tooltipWidget(vm), + _inventoryWidget(vm), _messageWidget(vm), _textWidget(vm), _tooltipWidget(vm), _verbsWidget(vm), _creditsWidget(vm), _optionsWidget(vm), _quitWidget(vm) { Common::fill(&_lookupTable[0], &_lookupTable[PALETTE_COUNT], 0); Common::fill(&_lookupTable1[0], &_lookupTable1[PALETTE_COUNT], 0); @@ -126,7 +126,7 @@ void TattooUserInterface::lookAtObject() { name.deleteLastChar(); // See if this Object Sound List entry matches the object's name - if (!_bgShape->_name.compareToIgnoreCase(name)) { + if (!_bgShape->_name.compareToIgnoreCase(name)) { // Move forward to get the sound filename while ((*p == ' ') || (*p == '=')) ++p; @@ -266,7 +266,7 @@ void TattooUserInterface::handleInput() { if (_lockoutTimer) --_lockoutTimer; - + // Key handling if (events.kbHit()) { _keyState = events.getKey(); @@ -416,7 +416,7 @@ void TattooUserInterface::doStandardControl() { if (vm.readFlags(FLAG_PLAYER_IS_HOLMES)) { freeMenu(); doJournal(); - + // See if we're in a Lab Table Room _menuMode = (scene._labTableScene) ? LAB_MODE : STD_MODE; return; @@ -573,7 +573,7 @@ void TattooUserInterface::displayObjectNames() { void TattooUserInterface::doInventory(int mode) { People &people = *_vm->_people; people[HOLMES].gotoStand(); - + _inventoryWidget.load(mode); _inventoryWidget.summonWindow(); @@ -661,7 +661,7 @@ void TattooUserInterface::putMessage(const char *formatStr, ...) { void TattooUserInterface::setupBGArea(const byte cMap[PALETTE_SIZE]) { Scene &scene = *_vm->_scene; - // This requires that there is a 16 grayscale palette sequence in the palette that goes from lighter + // This requires that there is a 16 grayscale palette sequence in the palette that goes from lighter // to darker as the palette numbers go up. The last palette entry in that run is specified by _bgColor byte *p = &_lookupTable[0]; for (int idx = 0; idx < PALETTE_COUNT; ++idx) @@ -693,7 +693,7 @@ void TattooUserInterface::setupBGArea(const byte cMap[PALETTE_SIZE]) { g = cMap[idx * 3 + 1] * 4 / 3; b = cMap[idx * 3 + 2] * 4 / 3; break; - + default: r = g = b = 0; break; @@ -703,7 +703,7 @@ void TattooUserInterface::setupBGArea(const byte cMap[PALETTE_SIZE]) { int cd = 99999; for (int pal = 0; pal < PALETTE_COUNT; ++pal) { - int d = (r - cMap[pal * 3]) * (r - cMap[pal * 3]) + (g - cMap[pal * 3 + 1]) * (g - cMap[pal * 3 + 1]) + + int d = (r - cMap[pal * 3]) * (r - cMap[pal * 3]) + (g - cMap[pal * 3 + 1]) * (g - cMap[pal * 3 + 1]) + (b - cMap[pal * 3 + 2]) * (b - cMap[pal * 3 + 2]); if (d < cd) { @@ -722,12 +722,12 @@ void TattooUserInterface::doBgAnimEraseBackground() { People &people = *_vm->_people; Scene &scene = *_vm->_scene; Screen &screen = *_vm->_screen; - + static const int16 OFFSETS[16] = { -1, -2, -3, -3, -2, -1, -1, 0, 1, 2, 3, 3, 2, 1, 0, 0 }; if (_mask != nullptr) { // Since a mask is active, restore the screen from the secondary back buffer prior to applying the mask - screen._backBuffer1.SHblitFrom(screen._backBuffer2, screen._currentScroll, Common::Rect(screen._currentScroll.x, 0, + screen._backBuffer1.SHblitFrom(screen._backBuffer2, screen._currentScroll, Common::Rect(screen._currentScroll.x, 0, screen._currentScroll.x + SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT)); switch (scene._currentScene) { @@ -768,7 +768,7 @@ void TattooUserInterface::doBgAnimEraseBackground() { } else { // Standard scene without mask, so call user interface to erase any UI elements as necessary doBgAnimRestoreUI(); - + // Restore background for any areas covered by characters and shapes for (int idx = 0; idx < MAX_CHARACTERS; ++idx) screen.restoreBackground(Common::Rect(people[idx]._oldPosition.x, people[idx]._oldPosition.y, @@ -776,10 +776,10 @@ void TattooUserInterface::doBgAnimEraseBackground() { for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) { Object &obj = scene._bgShapes[idx]; - - if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) || + + if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) || obj._type == HIDE_SHAPE || obj._type == REMOVE) - screen._backBuffer1.SHblitFrom(screen._backBuffer2, obj._oldPosition, + screen._backBuffer1.SHblitFrom(screen._backBuffer2, obj._oldPosition, Common::Rect(obj._oldPosition.x, obj._oldPosition.y, obj._oldPosition.x + obj._oldSize.x, obj._oldPosition.y + obj._oldSize.y)); } @@ -801,10 +801,10 @@ void TattooUserInterface::doBgAnimEraseBackground() { } // Adjust the Target Scroll if needed - if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll.x) < + if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll.x) < (SHERLOCK_SCREEN_WIDTH / 8) && people[people._walkControl]._delta.x < 0) { - - _targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - + + _targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - SHERLOCK_SCREEN_WIDTH / 8 - 250); if (_targetScroll.x < 0) _targetScroll.x = 0; @@ -812,7 +812,7 @@ void TattooUserInterface::doBgAnimEraseBackground() { if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll.x) > (SHERLOCK_SCREEN_WIDTH / 4 * 3) && people[people._walkControl]._delta.x > 0) - _targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - + _targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - SHERLOCK_SCREEN_WIDTH / 4 * 3 + 250); if (_targetScroll.x > _scrollSize) diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h index d89da4a6da..28e41219bf 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.h +++ b/engines/sherlock/tattoo/tattoo_user_interface.h @@ -42,7 +42,7 @@ namespace Sherlock { namespace Tattoo { // Button width/height -#define BUTTON_SIZE 15 +#define BUTTON_SIZE 15 // How long to play the intro before it can be skipped #define STARTUP_KEYS_DISABLED_DELAY 200 @@ -241,7 +241,7 @@ public: /** * Draw the user interface onto the screen's back buffers - */ + */ virtual void drawInterface(int bufferNum = 3); /** diff --git a/engines/sherlock/tattoo/widget_base.cpp b/engines/sherlock/tattoo/widget_base.cpp index a35f4e5d74..eab8e3217a 100644 --- a/engines/sherlock/tattoo/widget_base.cpp +++ b/engines/sherlock/tattoo/widget_base.cpp @@ -106,7 +106,7 @@ void WidgetBase::draw() { if (_bounds.width() > 0 && !_surface.empty()) { // Get the area to draw, adjusted for scroll position restrictToScreen(); - + // Draw the background for the widget drawBackground(); @@ -146,7 +146,7 @@ Common::String WidgetBase::splitLines(const Common::String &str, Common::StringA const char *lineStartP = strP; // Find how many characters will fit on the next line - while (width < maxWidth && *strP && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] || + while (width < maxWidth && *strP && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] || (byte)*strP == talk._opcodes[OP_NULL])) { width += _surface.charWidth(*strP); @@ -156,7 +156,7 @@ Common::String WidgetBase::splitLines(const Common::String &str, Common::StringA ++strP; } - // If the line was too wide to fit on a single line, go back to the last space + // If the line was too wide to fit on a single line, go back to the last space // if there was one, or otherwise simply break the line at this point if (width >= maxWidth && spaceP != nullptr) strP = spaceP; @@ -167,7 +167,7 @@ Common::String WidgetBase::splitLines(const Common::String &str, Common::StringA // Move the string ahead to the next line if (*strP == ' ' || *strP == 13) ++strP; - } while (*strP && (lines.size() < maxLines) && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] + } while (*strP && (lines.size() < maxLines) && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] || (byte)*strP == talk._opcodes[OP_NULL])); // Return any remaining text left over @@ -266,7 +266,7 @@ void WidgetBase::drawScrollBar(int index, int pageSize, int count) { // Draw the scroll position bar int barHeight = (r.height() - BUTTON_SIZE * 2) * pageSize / count; barHeight = CLIP(barHeight, BUTTON_SIZE, r.height() - BUTTON_SIZE * 2); - int barY = (count <= pageSize) ? r.top + BUTTON_SIZE : r.top + BUTTON_SIZE + + int barY = (count <= pageSize) ? r.top + BUTTON_SIZE : r.top + BUTTON_SIZE + (r.height() - BUTTON_SIZE * 2 - barHeight) * index / (count - pageSize); _surface.fillRect(Common::Rect(r.left + 2, barY + 2, r.right - 2, barY + barHeight - 3), INFO_MIDDLE); diff --git a/engines/sherlock/tattoo/widget_credits.cpp b/engines/sherlock/tattoo/widget_credits.cpp index 1c878daaf6..fa1ac6fbae 100644 --- a/engines/sherlock/tattoo/widget_credits.cpp +++ b/engines/sherlock/tattoo/widget_credits.cpp @@ -49,7 +49,7 @@ void WidgetCredits::initCredits() { const char *p = line.c_str() + 12; while ((*p < '0') || (*p > '9')) p++; - + _creditSpeed = atoi(p); } else if (line.hasPrefix("Y Spacing")) { const char *p = line.c_str() + 12; @@ -73,7 +73,7 @@ void WidgetCredits::initCredits() { if (p != nullptr && p[1] == '>') { cl._line2 = Common::String(p + 3); cl._line = Common::String(cl._line.c_str(), p); - + int width = cl._width; int width1 = screen.stringWidth(cl._line); int width2 = screen.stringWidth(cl._line2); diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp index 7666e81480..5e877c53f4 100644 --- a/engines/sherlock/tattoo/widget_files.cpp +++ b/engines/sherlock/tattoo/widget_files.cpp @@ -54,7 +54,7 @@ void WidgetFiles::show(SaveMode mode) { createSavegameList(); // Set up the display area - _bounds = Common::Rect(SHERLOCK_SCREEN_WIDTH * 2 / 3, (_surface.fontHeight() + 1) * + _bounds = Common::Rect(SHERLOCK_SCREEN_WIDTH * 2 / 3, (_surface.fontHeight() + 1) * (FILES_LINES_COUNT + 1) + 17); _bounds.moveTo(mousePos.x - _bounds.width() / 2, mousePos.y - _bounds.height() / 2); @@ -141,7 +141,7 @@ void WidgetFiles::render(FilesRenderMode mode) { int xp = _surface.stringWidth("00.") + _surface.widestChar() + 5; int yp = _surface.fontHeight() + 14; - + for (int idx = _savegameIndex; idx < (_savegameIndex + FILES_LINES_COUNT); ++idx) { if (idx == _selector && mode != RENDER_ALL) color = COMMAND_HIGHLIGHTED; @@ -150,7 +150,7 @@ void WidgetFiles::render(FilesRenderMode mode) { if (mode == RENDER_NAMES_AND_SCROLLBAR) _surface.fillRect(Common::Rect(4, yp, _surface.width() - BUTTON_SIZE - 9, yp + _surface.fontHeight()), TRANSPARENCY); - + Common::String numStr = Common::String::format("%d.", idx + 1); _surface.writeString(numStr, Common::Point(_surface.widestChar(), yp), color); _surface.writeString(_savegames[idx], Common::Point(xp, yp), color); @@ -170,7 +170,7 @@ void WidgetFiles::handleEvents() { Common::KeyState keyState = ui._keyState; // Handle scrollbar events - ScrollHighlight oldHighlight = ui._scrollHighlight; + ScrollHighlight oldHighlight = ui._scrollHighlight; handleScrollbarEvents(_savegameIndex, FILES_LINES_COUNT, _savegames.size()); int oldScrollIndex = _savegameIndex; @@ -258,11 +258,11 @@ bool WidgetFiles::getFilename() { assert(_selector != -1); Common::Point pt(_surface.stringWidth("00.") + _surface.widestChar() + 5, _surface.fontHeight() + 14 + (_selector - _savegameIndex) * (_surface.fontHeight() + 1)); - + Common::String numStr = Common::String::format("%d.", _selector + 1); _surface.writeString(numStr, Common::Point(_surface.widestChar(), pt.y), COMMAND_HIGHLIGHTED); - Common::String filename = _savegames[_selector]; + Common::String filename = _savegames[_selector]; if (isSlotEmpty(_selector)) { index = 0; @@ -328,7 +328,7 @@ bool WidgetFiles::getFilename() { _surface.writeString(filename.c_str() + index, pt, COMMAND_HIGHLIGHTED); } else if ((keyState.keycode == Common::KEYCODE_LEFT && index > 0) - || (keyState.keycode == Common::KEYCODE_RIGHT && index < 49 && pt.x < (_bounds.right - BUTTON_SIZE - 20)) + || (keyState.keycode == Common::KEYCODE_RIGHT && index < 49 && pt.x < (_bounds.right - BUTTON_SIZE - 20)) || (keyState.keycode == Common::KEYCODE_HOME && index > 0) || (keyState.keycode == Common::KEYCODE_END)) { _surface.fillRect(Common::Rect(pt.x, pt.y, pt.x + width, pt.y + _surface.fontHeight()), TRANSPARENCY); @@ -345,7 +345,7 @@ bool WidgetFiles::getFilename() { pt.x += _surface.charWidth(filename[index]); ++index; break; - + case Common::KEYCODE_HOME: pt.x = _surface.stringWidth("00.") + _surface.widestChar() + 5; index = 0; @@ -376,7 +376,7 @@ bool WidgetFiles::getFilename() { _surface.fillRect(Common::Rect(pt.x, pt.y, _bounds.right - BUTTON_SIZE - 9, pt.y + _surface.fontHeight() - 1), TRANSPARENCY); _surface.writeString(filename + index, pt, COMMAND_HIGHLIGHTED); - + } else if (keyState.keycode == Common::KEYCODE_RETURN) { done = 1; @@ -393,7 +393,7 @@ bool WidgetFiles::getFilename() { else filename.setChar(keyState.ascii, index); - _surface.fillRect(Common::Rect(pt.x, pt.y, _bounds.width() - BUTTON_SIZE - 9, + _surface.fillRect(Common::Rect(pt.x, pt.y, _bounds.width() - BUTTON_SIZE - 9, pt.y + _surface.fontHeight() - 1), TRANSPARENCY); _surface.writeString(filename.c_str() + index, pt, COMMAND_HIGHLIGHTED); pt.x += _surface.charWidth(keyState.ascii); diff --git a/engines/sherlock/tattoo/widget_files.h b/engines/sherlock/tattoo/widget_files.h index 87106f8edb..a4feb0d6dd 100644 --- a/engines/sherlock/tattoo/widget_files.h +++ b/engines/sherlock/tattoo/widget_files.h @@ -50,7 +50,7 @@ private: * Show the ScummVM Save Game dialog */ void showScummVMSaveDialog(); - + /** * Show the ScummVM Load Game dialog */ diff --git a/engines/sherlock/tattoo/widget_foolscap.cpp b/engines/sherlock/tattoo/widget_foolscap.cpp index 8225946838..f5afa56856 100644 --- a/engines/sherlock/tattoo/widget_foolscap.cpp +++ b/engines/sherlock/tattoo/widget_foolscap.cpp @@ -125,7 +125,7 @@ void WidgetFoolscap::show() { // Show the window summonWindow(); ui._menuMode = FOOLSCAP_MODE; -} +} void WidgetFoolscap::handleEvents() { Events &events = *_vm->_events; diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index 5e7238680a..24c32f6332 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -36,7 +36,7 @@ namespace Tattoo { #define MAX_INV_COMMANDS 10 // Maximum elements in dialog #define NUM_INV_PER_LINE 4 // Number of inentory items per line in the dialog -WidgetInventoryTooltip::WidgetInventoryTooltip(SherlockEngine *vm, WidgetInventory *owner) : +WidgetInventoryTooltip::WidgetInventoryTooltip(SherlockEngine *vm, WidgetInventory *owner) : WidgetTooltipBase(vm), _owner(owner) { } @@ -100,7 +100,7 @@ void WidgetInventoryTooltip::setText(const Common::String &str) { _surface.writeFancyString(str, Common::Point(0, 0), BLACK, INFO_TOP); } else { int xp, yp; - + xp = (_bounds.width() - _surface.stringWidth(line1) - 2) / 2; _surface.writeFancyString(line1, Common::Point(xp, 0), BLACK, INFO_TOP); @@ -110,7 +110,7 @@ void WidgetInventoryTooltip::setText(const Common::String &str) { } } -void WidgetInventoryTooltip::handleEvents() { +void WidgetInventoryTooltip::handleEvents() { Events &events = *_vm->_events; FixedText &fixedText = *_vm->_fixedText; Inventory &inv = *_vm->_inventory; @@ -133,7 +133,7 @@ void WidgetInventoryTooltip::handleEvents() { if (_owner->_invVerbMode == 3) { select = ui._bgFound; oldSelect = ui._oldBgFound; - + if (select != -1 && (select != oldSelect || (select != -1 && _surface.empty()))) { // See if we're pointing at a shape or a sprite if (select < 1000) { @@ -143,17 +143,17 @@ void WidgetInventoryTooltip::handleEvents() { if (_vm->getLanguage() == Common::GR_GRE) { if (!_owner->_swapItems) - str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), obj._description.c_str(), + str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), obj._description.c_str(), inv[_owner->_invSelect]._name.c_str(), _owner->_verb.c_str()); else - str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), inv[_owner->_invSelect]._name.c_str(), + str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), inv[_owner->_invSelect]._name.c_str(), obj._description.c_str(), _owner->_verb.c_str()); } else { if (_owner->_swapItems) - str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), obj._description.c_str(), _owner->_action.c_str(), + str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), obj._description.c_str(), _owner->_action.c_str(), inv[_owner->_invSelect]._name.c_str()); else - str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), inv[_owner->_invSelect]._name.c_str(), + str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), inv[_owner->_invSelect]._name.c_str(), _owner->_action.c_str(), obj._description.c_str()); } } @@ -192,7 +192,7 @@ void WidgetInventoryTooltip::handleEvents() { select = -1; } else { oldSelect = _owner->_invSelect; - + if (select != _owner->_invSelect || _surface.empty()) { if (_owner->_invMode == 1) { @@ -249,7 +249,7 @@ void WidgetInventoryTooltip::handleEvents() { /*----------------------------------------------------------------*/ -WidgetInventoryVerbs::WidgetInventoryVerbs(SherlockEngine *vm, WidgetInventory *owner) : +WidgetInventoryVerbs::WidgetInventoryVerbs(SherlockEngine *vm, WidgetInventory *owner) : WidgetBase(vm), _owner(owner) { _invVerbSelect = _oldInvVerbSelect = -1; } @@ -472,7 +472,7 @@ void WidgetInventoryVerbs::highlightControls() { /*----------------------------------------------------------------*/ -WidgetInventory::WidgetInventory(SherlockEngine *vm) : WidgetBase(vm), +WidgetInventory::WidgetInventory(SherlockEngine *vm) : WidgetBase(vm), _tooltipWidget(vm, this), _verbList(vm, this) { _invMode = 0; _invVerbMode = 0; @@ -571,7 +571,7 @@ void WidgetInventory::drawInventory() { } } - drawScrollBar(inv._invIndex / NUM_INV_PER_LINE, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, + drawScrollBar(inv._invIndex / NUM_INV_PER_LINE, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, (inv._holdings + NUM_INV_PER_LINE - 1) / NUM_INV_PER_LINE); } @@ -594,10 +594,10 @@ void WidgetInventory::handleEvents() { int invIndex = inv._invIndex / NUM_INV_PER_LINE; ScrollHighlight oldHighlight = ui._scrollHighlight; - handleScrollbarEvents(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, + handleScrollbarEvents(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, (inv._holdings + NUM_INV_PER_LINE - 1) / NUM_INV_PER_LINE); - handleScrolling(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, + handleScrolling(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, (inv._holdings + NUM_INV_PER_LINE - 1) / NUM_INV_PER_LINE); if (oldScrollIndex != invIndex) { @@ -665,16 +665,16 @@ void WidgetInventory::handleEvents() { ui.putMessage("%s", FIXED(NoEffect)); } } else if ((_outsideMenu && !_bounds.contains(mousePos)) || ui._keyState.keycode == Common::KEYCODE_ESCAPE) { - // Want to close the window (clicked outside of it). So close the window and return to Standard + // Want to close the window (clicked outside of it). So close the window and return to Standard close(); } else if (_bounds.contains(mousePos)) { // Mouse button was released inside the inventory window _outsideMenu = false; - + // See if they are pointing at one of the inventory items if (_invSelect != -1) { - // See if they are in Use Obj with Inv. Mode (they right clicked on an item + // See if they are in Use Obj with Inv. Mode (they right clicked on an item // in the room and selected "Use with Inv.") if (_invMode == 1) { _tooltipWidget.banishWindow(); @@ -709,13 +709,13 @@ void WidgetInventory::handleEvents() { _verbList._oldInvVerbSelect = -1; _tooltipWidget.banishWindow(); - // Keep track of the name of the inventory object so we can check it against the target fields + // Keep track of the name of the inventory object so we can check it against the target fields // of verbs when we activate it _invTarget = inv[_invSelect]._name; _swapItems = false; _verbList.load(); - } else { + } else { // They left clicked on an inventory item, so Look at it // Check if they are looking at the solved Foolscap @@ -726,7 +726,7 @@ void WidgetInventory::handleEvents() { _invVerbMode = 0; inv.freeInv(); - + events.clearEvents(); events.setCursor(ARROW); ui._menuMode = scene._labTableScene ? LAB_MODE : STD_MODE; diff --git a/engines/sherlock/tattoo/widget_lab.cpp b/engines/sherlock/tattoo/widget_lab.cpp index eb32e2e22c..5e6b88df9d 100644 --- a/engines/sherlock/tattoo/widget_lab.cpp +++ b/engines/sherlock/tattoo/widget_lab.cpp @@ -93,7 +93,7 @@ void WidgetLab::handleEvents() { // Show the command list for this object ui._verbsWidget.load(!noDesc); } else if (!noDesc) { - // The player has released on an object, see if they had an object selected + // The player has released on an object, see if they had an object selected // that will be used with this new object if (_labObject) { // See if the dragged object can be used with the new object @@ -150,7 +150,7 @@ void WidgetLab::handleEvents() { // Set the mouse cursor to the object Graphics::Surface &img = _labObject->_imageFrame->_frame; - Common::Point cursorOffset = mousePos - _labObject->_position; + Common::Point cursorOffset = mousePos - _labObject->_position; events.setCursor(ARROW, cursorOffset, img); ui._tooltipWidget._offsetY = cursorOffset.y; diff --git a/engines/sherlock/tattoo/widget_options.cpp b/engines/sherlock/tattoo/widget_options.cpp index 81f50f3bc5..35f1f267dc 100644 --- a/engines/sherlock/tattoo/widget_options.cpp +++ b/engines/sherlock/tattoo/widget_options.cpp @@ -192,7 +192,7 @@ void WidgetOptions::handleEvents() { render(OP_NAMES); vm.saveConfig(); break; - + case 7: // Toggle Text Windows vm._textWindowsOn = !vm._textWindowsOn; @@ -230,7 +230,7 @@ void WidgetOptions::handleEvents() { default: break; } - + _oldSelector = -1; } } @@ -302,17 +302,17 @@ void WidgetOptions::render(OptionRenderMode mode) { int num = (_surface.fontHeight() + 4) & 0xfe; int sliderY = yp + num / 2 - 8; - _surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5, + _surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5, sliderY - (num - 6) / 2 + num - 1), TRANSPARENCY); - _surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2, + _surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2, _surface.width() - _surface.widestChar() - 1, sliderY + 3), INFO_MIDDLE); drawDialogRect(Common::Rect(_surface.widestChar(), sliderY, _surface.width() - _surface.widestChar(), sliderY + 6)); - - _surface.fillRect(Common::Rect(_midiSliderX - 1, sliderY - (num - 6) / 2 + 2, + + _surface.fillRect(Common::Rect(_midiSliderX - 1, sliderY - (num - 6) / 2 + 2, _midiSliderX + 1, sliderY - (num - 6) / 2 + num - 3), INFO_MIDDLE); - drawDialogRect(Common::Rect(_midiSliderX - 3, sliderY - (num - 6) / 2, + drawDialogRect(Common::Rect(_midiSliderX - 3, sliderY - (num - 6) / 2, _midiSliderX + 4, sliderY - (num - 6) / 2 + num)); - + if (_midiSliderX - 4 > _surface.widestChar()) _surface.fillRect(Common::Rect(_midiSliderX - 4, sliderY, _midiSliderX - 4, sliderY + 4), INFO_BOTTOM); if (_midiSliderX + 4 < _surface.width() - _surface.widestChar()) @@ -332,14 +332,14 @@ void WidgetOptions::render(OptionRenderMode mode) { int num = (_surface.fontHeight() + 4) & 0xfe; int sliderY = yp + num / 2 - 8; - _surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5, + _surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5, sliderY - (num - 6) / 2 + num - 1), TRANSPARENCY); - _surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2, _surface.width() - _surface.widestChar() - 1, + _surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2, _surface.width() - _surface.widestChar() - 1, sliderY + 3), INFO_MIDDLE); drawDialogRect(Common::Rect(_surface.widestChar(), sliderY, _surface.width() - _surface.widestChar(), sliderY + 6)); - _surface.fillRect(Common::Rect(_digiSliderX - 1, sliderY - (num - 6) / 2 + 2, _digiSliderX + 1, + _surface.fillRect(Common::Rect(_digiSliderX - 1, sliderY - (num - 6) / 2 + 2, _digiSliderX + 1, sliderY - (num - 6) / 2 + num - 3), INFO_MIDDLE); - drawDialogRect(Common::Rect(_digiSliderX - 3, sliderY - (num - 6) / 2, _digiSliderX + 4, + drawDialogRect(Common::Rect(_digiSliderX - 3, sliderY - (num - 6) / 2, _digiSliderX + 4, sliderY - (num - 6) / 2 + num)); if (_digiSliderX - 4 > _surface.widestChar()) _surface.fillRect(Common::Rect(_digiSliderX - 4, sliderY, _digiSliderX - 4, sliderY + 4), INFO_BOTTOM); diff --git a/engines/sherlock/tattoo/widget_password.cpp b/engines/sherlock/tattoo/widget_password.cpp index 2a2921026d..90e67729c5 100644 --- a/engines/sherlock/tattoo/widget_password.cpp +++ b/engines/sherlock/tattoo/widget_password.cpp @@ -119,7 +119,7 @@ void WidgetPassword::handleEvents() { _surface.fillRect(Common::Rect(_cursorPos.x, _cursorPos.y, _cursorPos.x + width, _cursorPos.y + _surface.fontHeight()), TRANSPARENCY); if (currentChar != ' ') _surface.writeString(Common::String::format("%c", _password[_index]), _cursorPos, COMMAND_HIGHLIGHTED); - + switch (keycode) { case Common::KEYCODE_LEFT: _cursorPos.x -= _surface.charWidth(_password[_index - 1]); @@ -136,7 +136,7 @@ void WidgetPassword::handleEvents() { case Common::KEYCODE_END: _cursorPos.x = _surface.stringWidth(_password) + _surface.widestChar(); _index = _password.size(); - + while (_index > 0 && _password[_index - 1] == ' ') { _cursorPos.x -= _surface.charWidth(_password[_index - 1]); --_index; @@ -187,7 +187,7 @@ void WidgetPassword::handleEvents() { void WidgetPassword::close() { Talk &talk = *_vm->_talk; - + banishWindow(); if (talk._talkToAbort) return; diff --git a/engines/sherlock/tattoo/widget_quit.cpp b/engines/sherlock/tattoo/widget_quit.cpp index ea8f2e080c..92fabc49bf 100644 --- a/engines/sherlock/tattoo/widget_quit.cpp +++ b/engines/sherlock/tattoo/widget_quit.cpp @@ -130,7 +130,7 @@ void WidgetQuit::handleEvents() { byte color = (_select == 1) ? COMMAND_HIGHLIGHTED : INFO_TOP; int yp = (_surface.fontHeight() + 4) * 2 + 8; _surface.writeString(FIXED(Yes), Common::Point((_surface.width() - _surface.stringWidth(FIXED(Yes))) / 2, yp), color); - + color = (_select == 0) ? COMMAND_HIGHLIGHTED : INFO_TOP; yp += (_surface.fontHeight() + 7); _surface.writeString(FIXED(No), Common::Point((_surface.width() - _surface.stringWidth(FIXED(No))) / 2, yp), color); diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp index aec664561e..4a5b7f7dc7 100644 --- a/engines/sherlock/tattoo/widget_talk.cpp +++ b/engines/sherlock/tattoo/widget_talk.cpp @@ -133,7 +133,7 @@ void WidgetTalk::handleEvents() { // Flag if they started pressing outside of the window if (events._firstPress && !_bounds.contains(mousePos)) _outsideMenu = true; - + // Check for which statement they are pointing at _selector = -1; if (ui._scrollHighlight == SH_NONE) { @@ -159,7 +159,7 @@ void WidgetTalk::handleEvents() { if (keycode == Common::KEYCODE_TAB && ui._scrollHighlight == SH_NONE) { if (_selector == -1) { _selector = _statementLines[_scroll ? _talkScrollIndex : 0]._num; - + events.warpMouse(Common::Point(_bounds.right - BUTTON_SIZE - 10, _bounds.top + _surface.fontHeight() + 2)); } else { if (ui._keyState.flags & Common::KBD_SHIFT) { @@ -275,7 +275,7 @@ void WidgetTalk::handleEvents() { do { talk._scriptSelect = _selector; talk._speaker = talk._talkTo; - + // Make a copy of the reply (since talkTo can reload the statements list), and call talkTo Common::String reply = talk._statements[_selector]._reply; talk.doScript(reply); @@ -430,7 +430,7 @@ void WidgetTalk::setStatementLines() { ++numStatements; } - // If there are more lines than can be displayed in the interface window at one time, adjust the allowed + // If there are more lines than can be displayed in the interface window at one time, adjust the allowed // width to take into account needing a scrollbar int xSize = _scroll ? _bounds.width() - BUTTON_SIZE - 3 : _bounds.width(); diff --git a/engines/sherlock/tattoo/widget_text.cpp b/engines/sherlock/tattoo/widget_text.cpp index a29cd2700f..b9653e371a 100644 --- a/engines/sherlock/tattoo/widget_text.cpp +++ b/engines/sherlock/tattoo/widget_text.cpp @@ -56,14 +56,14 @@ void WidgetText::load(const Common::String &str, int speaker) { // See if it's only a single line long if (height == _surface.fontHeight() + 10) { width = _surface.widestChar() * 2 + 6; - + const char *strP = str.c_str(); while (*strP && (*strP < talk._opcodes[OP_SWITCH_SPEAKER] || *strP == talk._opcodes[OP_NULL])) width += _surface.charWidth(*strP++); } _bounds = Common::Rect(width, height); - + if (speaker == -1) { // No speaker specified, so center window on look position _bounds.translate(ui._lookPos.x - width / 2, ui._lookPos.y - height / 2); @@ -89,11 +89,11 @@ void WidgetText::centerWindowOnSpeaker(int speaker) { int scaleVal = scene.getScaleVal(people[HOLMES]._position); if (scaleVal == SCALE_THRESHOLD) { pt.x += people[HOLMES].frameWidth() / 2; - pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES].frameHeight() + pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES].frameHeight() - _bounds.height() - _surface.fontHeight(); } else { pt.x += people[HOLMES]._imageFrame->sDrawXSize(scaleVal) / 2; - pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES]._imageFrame->sDrawYSize(scaleVal) + pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES]._imageFrame->sDrawYSize(scaleVal) - _bounds.height() - _surface.fontHeight(); } } else { diff --git a/engines/sherlock/tattoo/widget_tooltip.cpp b/engines/sherlock/tattoo/widget_tooltip.cpp index 1560cb9a80..27f9c22d69 100644 --- a/engines/sherlock/tattoo/widget_tooltip.cpp +++ b/engines/sherlock/tattoo/widget_tooltip.cpp @@ -44,10 +44,10 @@ void WidgetTooltipBase::draw() { // Blit the affected area to the screen screen.slamRect(_bounds); - + // Draw the widget directly onto the screen. Unlike other widgets, we don't draw to the back buffer, // since nothing should be drawing on top of tooltips, so there's no need to store in the back buffer - screen.SHtransBlitFrom(_surface, Common::Point(_bounds.left - screen._currentScroll.x, + screen.SHtransBlitFrom(_surface, Common::Point(_bounds.left - screen._currentScroll.x, _bounds.top - screen._currentScroll.y)); // Store a copy of the drawn area for later erasing @@ -76,7 +76,7 @@ void WidgetTooltip::setText(const Common::String &str) { Events &events = *_vm->_events; Common::Point mousePos = events.mousePos(); bool reset = false; - + // Make sure that the description is present if (!str.empty()) { int width = _surface.stringWidth(str) + 2; @@ -200,7 +200,7 @@ void WidgetSceneTooltip::handleEvents() { str = scene._exits[ui._arrowZone]._dest; } - setText(str.hasPrefix(" ") ? Common::String() : str); + setText(str.hasPrefix(" ") ? Common::String() : str); } else if ((ui._bgFound == -1 && ui._oldBgFound != -1) || (ui._arrowZone == -1 && ui._oldArrowZone != -1)) { setText(""); } diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp index 5041888ffb..171fb247bc 100644 --- a/engines/sherlock/tattoo/widget_verbs.cpp +++ b/engines/sherlock/tattoo/widget_verbs.cpp @@ -65,7 +65,7 @@ void WidgetVerbs::load(bool objectsOn) { if (scumm_strnicmp(person._examine.c_str(), "_EXIT", 5)) _verbCommands.push_back(FIXED(Look)); - + _verbCommands.push_back(FIXED(Talk)); // Add any extra active verbs from the NPC's verb list @@ -116,7 +116,7 @@ void WidgetVerbs::load(bool objectsOn) { // Set the bounds _bounds = Common::Rect(width, height); _bounds.moveTo(mousePos.x - _bounds.width() / 2, mousePos.y - _bounds.height() / 2); - + // Render the window on the internal surface render(); } @@ -134,7 +134,7 @@ void WidgetVerbs::render() { // Draw the verb commands and the lines separating them for (uint idx = 0; idx < _verbCommands.size(); ++idx) { - _surface.writeString(_verbCommands[idx], Common::Point((_bounds.width() - _surface.stringWidth(_verbCommands[idx])) / 2, + _surface.writeString(_verbCommands[idx], Common::Point((_bounds.width() - _surface.stringWidth(_verbCommands[idx])) / 2, (_surface.fontHeight() + 7) * idx + 5), INFO_TOP); if (idx < (_verbCommands.size() - 1)) { @@ -143,7 +143,7 @@ void WidgetVerbs::render() { _surface.hLine(3, (_surface.fontHeight() + 7) * (idx + 1) + 2, _bounds.width() - 4, INFO_BOTTOM); _surface.SHtransBlitFrom(images[4], Common::Point(0, (_surface.fontHeight() + 7) * (idx + 1) - 1)); - _surface.SHtransBlitFrom(images[5], Common::Point(_bounds.width() - images[5]._width, + _surface.SHtransBlitFrom(images[5], Common::Point(_bounds.width() - images[5]._width, (_surface.fontHeight() + 7) * (idx + 1) - 1)); } } @@ -226,7 +226,7 @@ void WidgetVerbs::handleEvents() { // Talk command is being activated talk.initTalk(ui._activeObj); ui._activeObj = -1; - + } else if (!_verbCommands[_selector].compareToIgnoreCase(strJournal)) { ui.doJournal(); |