diff options
author | Paul Gilbert | 2015-05-12 19:55:53 -0400 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-05-13 14:43:50 +0200 |
commit | 2db576357f1a697d0a03e9fc32de6604bdf138ef (patch) | |
tree | 1a854fb020a0ff7299a65e2b51ea95a9d96bdb13 /engines | |
parent | 95212c5f0290b2cbebed6b179efa57397f08b39b (diff) | |
download | scummvm-rg350-2db576357f1a697d0a03e9fc32de6604bdf138ef.tar.gz scummvm-rg350-2db576357f1a697d0a03e9fc32de6604bdf138ef.tar.bz2 scummvm-rg350-2db576357f1a697d0a03e9fc32de6604bdf138ef.zip |
SHERLOCK: Rename object loading methods from synchronize to load
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sherlock/objects.cpp | 24 | ||||
-rw-r--r-- | engines/sherlock/objects.h | 8 | ||||
-rw-r--r-- | engines/sherlock/scene.cpp | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index acb13dd593..b4371cd71b 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -365,9 +365,9 @@ void Sprite::checkSprite() { /*----------------------------------------------------------------*/ /** - * Synchronize the data for a savegame + * Load the data for the action */ -void ActionType::synchronize(Common::SeekableReadStream &s) { +void ActionType::load(Common::SeekableReadStream &s) { char buffer[12]; _cAnimNum = s.readByte(); @@ -391,9 +391,9 @@ UseType::UseType() { } /** - * Synchronize the data for a savegame + * Load the data for the UseType */ -void UseType::synchronize(Common::SeekableReadStream &s) { +void UseType::load(Common::SeekableReadStream &s) { char buffer[12]; _cAnimNum = s.readByte(); @@ -459,9 +459,9 @@ Object::Object() { } /** - * Load the object data from the passed stream + * Load the data for the object */ -void Object::synchronize(Common::SeekableReadStream &s) { +void Object::load(Common::SeekableReadStream &s) { char buffer[41]; s.read(buffer, 12); _name = Common::String(buffer); @@ -504,7 +504,7 @@ void Object::synchronize(Common::SeekableReadStream &s) { _misc = s.readByte(); _maxFrames = s.readUint16LE(); _flags = s.readByte(); - _aOpen.synchronize(s); + _aOpen.load(s); _aType = (AType)s.readByte(); _lookFrames = s.readByte(); _seqCounter = s.readByte(); @@ -512,18 +512,18 @@ void Object::synchronize(Common::SeekableReadStream &s) { _lookPosition.y = s.readByte(); _lookFacing = s.readByte(); _lookcAnim = s.readByte(); - _aClose.synchronize(s); + _aClose.load(s); _seqStack = s.readByte(); _seqTo = s.readByte(); _descOffset = s.readUint16LE(); _seqCounter2 = s.readByte(); _seqSize = s.readUint16LE(); s.skip(1); - _aMove.synchronize(s); + _aMove.load(s); s.skip(8); for (int idx = 0; idx < 4; ++idx) - _use[idx].synchronize(s); + _use[idx].load(s); } /** @@ -1099,9 +1099,9 @@ const Common::Rect Object::getOldBounds() const { /*----------------------------------------------------------------*/ /** - * Synchronize the data for a savegame + * Load the data for the animation */ -void CAnim::synchronize(Common::SeekableReadStream &s) { +void CAnim::load(Common::SeekableReadStream &s) { char buffer[12]; s.read(buffer, 12); _name = Common::String(buffer); diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h index 52bd15cbbc..4068973e58 100644 --- a/engines/sherlock/objects.h +++ b/engines/sherlock/objects.h @@ -148,7 +148,7 @@ struct ActionType { int _cAnimSpeed; Common::String _names[4]; - void synchronize(Common::SeekableReadStream &s); + void load(Common::SeekableReadStream &s); }; struct UseType { @@ -161,7 +161,7 @@ struct UseType { Common::String _target; UseType(); - void synchronize(Common::SeekableReadStream &s); + void load(Common::SeekableReadStream &s); }; class Object { @@ -222,7 +222,7 @@ public: Object(); - void synchronize(Common::SeekableReadStream &s); + void load(Common::SeekableReadStream &s); void toggleHidden(); @@ -255,7 +255,7 @@ struct CAnim { Common::Point _teleportPos; // Location Holmes shoul teleport to after int _teleportDir; // playing canim - void synchronize(Common::SeekableReadStream &s); + void load(Common::SeekableReadStream &s); }; struct SceneImage { diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index 4b0cbee07d..f473004d9a 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -261,7 +261,7 @@ bool Scene::loadScene(const Common::String &filename) { _bgShapes.resize(bgHeader._numStructs); for (int idx = 0; idx < bgHeader._numStructs; ++idx) - _bgShapes[idx].synchronize(*infoStream); + _bgShapes[idx].load(*infoStream); if (bgHeader._descSize) { _descText.resize(bgHeader._descSize); @@ -318,7 +318,7 @@ bool Scene::loadScene(const Common::String &filename) { _cAnim.resize(bgHeader._numcAnimations); for (uint idx = 0; idx < _cAnim.size(); ++idx) - _cAnim[idx].synchronize(*canimStream); + _cAnim[idx].load(*canimStream); delete canimStream; } |