diff options
author | Torbjörn Andersson | 2015-08-29 21:30:55 +0200 |
---|---|---|
committer | Torbjörn Andersson | 2015-08-29 21:30:55 +0200 |
commit | 303bbe75d58b74dac6ef38c7bebf59f72fca42b1 (patch) | |
tree | 129261a657130c5ad9cec323f5fabfe865a67558 /engines | |
parent | e734bb5078055521e04508ce19c5766b36817300 (diff) | |
download | scummvm-rg350-303bbe75d58b74dac6ef38c7bebf59f72fca42b1.tar.gz scummvm-rg350-303bbe75d58b74dac6ef38c7bebf59f72fca42b1.tar.bz2 scummvm-rg350-303bbe75d58b74dac6ef38c7bebf59f72fca42b1.zip |
SHERLOCK: Fix comment typos
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sherlock/objects.cpp | 4 | ||||
-rw-r--r-- | engines/sherlock/resources.cpp | 4 | ||||
-rw-r--r-- | engines/sherlock/resources.h | 8 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_people.cpp | 4 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_people.h | 2 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.h | 2 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_people.cpp | 4 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_people.h | 2 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 4 | ||||
-rw-r--r-- | engines/sherlock/tattoo/widget_files.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/tattoo/widget_inventory.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/tattoo/widget_talk.cpp | 4 |
12 files changed, 21 insertions, 21 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 533d2bcc67..b2ffdfbacc 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -90,7 +90,7 @@ BaseObject::BaseObject() { bool BaseObject::hasAborts() const { int seqNum = _talkSeq; - // See if the object is in it's regular sequence + // See if the object is in its regular sequence bool startChecking = !seqNum || _type == CHARACTER; uint idx = 0; @@ -445,7 +445,7 @@ void BaseObject::setObjSequence(int seq, bool wait) { // Use the saved start of the sequence to reset the frame _frameNumber = _startSeq; } else { - // For Scalpel, scan backwards from the end of the sequence to find it's start + // For Scalpel, scan backwards from the end of the sequence to find its start do { --_frameNumber; } while (_frameNumber > 0 && _sequences[_frameNumber] != 0); diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp index 4cdf688676..8432c071ba 100644 --- a/engines/sherlock/resources.cpp +++ b/engines/sherlock/resources.cpp @@ -64,7 +64,7 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream) // Check whether the file is compressed if (signature == MKTAG('L', 'Z', 'V', 26)) { - // It's compressed, so decompress the file and store it's data in the cache entry + // It's compressed, so decompress the file and store its data in the cache entry Common::SeekableReadStream *decompressed = _vm->_res->decompress(stream); cacheEntry.resize(decompressed->size()); decompressed->read(&cacheEntry[0], decompressed->size()); @@ -200,7 +200,7 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename, cons // Open up the library for access Common::SeekableReadStream *libStream = load(libraryFile); - // Check if the library has already had it's index read, and if not, load it + // Check if the library has already had its index read, and if not, load it if (!_indexes.contains(libraryFile)) loadLibraryIndex(libraryFile, libStream, false); LibraryIndex &libIndex = _indexes[libraryFile]; diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h index cb8816c2ec..8275703491 100644 --- a/engines/sherlock/resources.h +++ b/engines/sherlock/resources.h @@ -88,7 +88,7 @@ private: int _resourceIndex; /** - * Reads in the index from a library file, and caches it's index for later use + * Reads in the index from a library file, and caches its index for later use */ void loadLibraryIndex(const Common::String &libFilename, Common::SeekableReadStream *stream, bool isNewStyle); public: @@ -96,7 +96,7 @@ public: /** * Adds the specified file to the cache. If it's a library file, takes care of - * loading it's index for future use + * loading its index for future use */ void addToCache(const Common::String &filename); @@ -113,7 +113,7 @@ public: bool isInCache(const Common::String &filename) const { return _cache.isCached(filename); } /** - * Checks the passed stream, and if is compressed, deletes it and replaces it with it's uncompressed data + * Checks the passed stream, and if is compressed, deletes it and replaces it with its uncompressed data */ void decompressIfNecessary(Common::SeekableReadStream *&stream); @@ -133,7 +133,7 @@ public: bool exists(const Common::String &filename) const; /** - * Returns the index of the last loaded resource in it's given library file. + * Returns the index of the last loaded resource in its given library file. * This will be used primarily when loading talk files, so the engine can * update the given conversation number in the journal */ diff --git a/engines/sherlock/scalpel/scalpel_people.cpp b/engines/sherlock/scalpel/scalpel_people.cpp index 0a9d510df5..57cf9f9d38 100644 --- a/engines/sherlock/scalpel/scalpel_people.cpp +++ b/engines/sherlock/scalpel/scalpel_people.cpp @@ -315,8 +315,8 @@ void ScalpelPerson::setWalking() { } // See if the new walk sequence is the same as the old. If it's a new one, - // we need to reset the frame number to zero so it's animation starts at - // it's beginning. Otherwise, if it's the same sequence, we can leave it + // we need to reset the frame number to zero so its animation starts at + // its beginning. Otherwise, if it's the same sequence, we can leave it // as is, so it keeps the animation going at wherever it was up to if (_sequenceNumber != _oldWalkSequence) _frameNumber = 0; diff --git a/engines/sherlock/scalpel/scalpel_people.h b/engines/sherlock/scalpel/scalpel_people.h index 941c2dc274..2ab6f5bc7d 100644 --- a/engines/sherlock/scalpel/scalpel_people.h +++ b/engines/sherlock/scalpel/scalpel_people.h @@ -52,7 +52,7 @@ public: virtual void synchronize(Serializer &s); /** - * This adjusts the sprites position, as well as it's animation sequence: + * This adjusts the sprites position, as well as its animation sequence: */ virtual void adjustSprite(); diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h index 7829ffca9f..9a55189a66 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.h +++ b/engines/sherlock/scalpel/scalpel_user_interface.h @@ -84,7 +84,7 @@ private: void lookScreen(const Common::Point &pt); /** - * Gets the item in the inventory the mouse is on and display's it's description + * Gets the item in the inventory the mouse is on and display's its description */ void lookInv(); diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index b3f02f4ba9..ac4366261f 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -486,8 +486,8 @@ void TattooPerson::setWalking() { } // See if the new walk sequence is the same as the old. If it's a new one, - // we need to reset the frame number to zero so it's animation starts at - // it's beginning. Otherwise, if it's the same sequence, we can leave it + // we need to reset the frame number to zero so its animation starts at + // its beginning. Otherwise, if it's the same sequence, we can leave it // as is, so it keeps the animation going at wherever it was up to if (_sequenceNumber != _oldWalkSequence) { if (_seqTo) { diff --git a/engines/sherlock/tattoo/tattoo_people.h b/engines/sherlock/tattoo/tattoo_people.h index 66123a7f72..722c4a9aaa 100644 --- a/engines/sherlock/tattoo/tattoo_people.h +++ b/engines/sherlock/tattoo/tattoo_people.h @@ -188,7 +188,7 @@ public: void walkBothToCoords(const PositionFacing &holmesDest, const PositionFacing &npcDest); /** - * This adjusts the sprites position, as well as it's animation sequence: + * This adjusts the sprites position, as well as its animation sequence: */ virtual void adjustSprite(); diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index a3742109e8..75d436b0c0 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -342,7 +342,7 @@ void TattooUserInterface::doBgAnimRestoreUI() { if (scene._activeCAnim.active()) screen.restoreBackground(scene._activeCAnim._oldBounds); - // If a canimation just ended, remove it's graphics from the backbuffer + // If a canimation just ended, remove its graphics from the backbuffer if (scene._activeCAnim._removeBounds.width() > 0) screen.restoreBackground(scene._activeCAnim._removeBounds); } @@ -481,7 +481,7 @@ void TattooUserInterface::doStandardControl() { talk.initTalk(_bgFound); _activeObj = -1; } else if (!noDesc) { - // Either call the code to Look at it's Examine Field or call the Exit animation + // Either call the code to Look at its Examine Field or call the Exit animation // if the object is an exit, specified by the first four characters of the name being "EXIT" Common::String name = _personFound ? people[_bgFound - 1000]._name : _bgShape->_name; if (!name.hasPrefix("EXIT")) { diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp index 606c8210b0..c9a20b0f8a 100644 --- a/engines/sherlock/tattoo/widget_files.cpp +++ b/engines/sherlock/tattoo/widget_files.cpp @@ -58,7 +58,7 @@ void WidgetFiles::show(SaveMode mode) { (FILES_LINES_COUNT + 1) + 17); _bounds.moveTo(mousePos.x - _bounds.width() / 2, mousePos.y - _bounds.height() / 2); - // Create the surface and render it's contents + // Create the surface and render its contents _surface.create(_bounds.width(), _bounds.height()); render(RENDER_ALL); diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index 20881ef012..3555ecdffd 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -41,7 +41,7 @@ WidgetInventoryTooltip::WidgetInventoryTooltip(SherlockEngine *vm, WidgetInvento } void WidgetInventoryTooltip::setText(const Common::String &str) { - // If no text specified, erase any previously displayed tooltip and free it's surface + // If no text specified, erase any previously displayed tooltip and free its surface if (str.empty()) { erase(); _surface.free(); diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp index b0cc7bcfb2..969ffe75c0 100644 --- a/engines/sherlock/tattoo/widget_talk.cpp +++ b/engines/sherlock/tattoo/widget_talk.cpp @@ -303,7 +303,7 @@ void WidgetTalk::handleEvents() { int select = -1; _selector = _oldSelector = -1; - // Find the first statement that has all it's flags set correctly + // Find the first statement that has all its flags set correctly for (uint idx = 0; idx < talk._statements.size() && select == -1; ++select) { if (!talk._statements[idx]._talkMap) select = idx; @@ -441,7 +441,7 @@ void WidgetTalk::setStatementLines() { _statementLines.clear(); for (uint statementNum = 0; statementNum < talk._statements.size(); ++statementNum) { - // See if this statment meets all of it's flag requirements + // See if this statment meets all of its flag requirements if (talk._statements[statementNum]._talkMap != -1) { // Get the next statement text to process Common::String str = talk._statements[statementNum]._statement; |