[Scummvm-cvs-logs] scummvm master -> e754adbf776c9c591772090f59c2d9a2a63d9313
dreammaster
dreammaster at scummvm.org
Sat Jul 25 23:27:53 CEST 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e754adbf77 SHERLOCK: Remove redundant People::synchronize code
Commit: e754adbf776c9c591772090f59c2d9a2a63d9313
https://github.com/scummvm/scummvm/commit/e754adbf776c9c591772090f59c2d9a2a63d9313
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-25T17:26:56-04:00
Commit Message:
SHERLOCK: Remove redundant People::synchronize code
Changed paths:
engines/sherlock/people.cpp
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 1e19dcc..9cd4a16 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -301,32 +301,4 @@ void People::clearTalking() {
}
}
-void People::synchronize(Serializer &s) {
- s.syncAsByte(_holmesOn);
-
- if (IS_SERRATED_SCALPEL) {
- s.syncAsSint16LE(_data[HOLMES]->_position.x);
- s.syncAsSint16LE(_data[HOLMES]->_position.y);
- s.syncAsSint16LE(_data[HOLMES]->_sequenceNumber);
- } else {
- for (uint idx = 0; idx < _data.size(); ++idx) {
- Person &p = *_data[idx];
- s.syncAsSint16LE(p._position.x);
- s.syncAsSint16LE(p._position.y);
- s.syncAsSint16LE(p._sequenceNumber);
- s.syncAsSint16LE(p._type);
- s.syncString(p._walkVGSName);
- s.syncString(p._description);
- s.syncString(p._examine);
- }
- }
-
- s.syncAsSint16LE(_holmesQuotient);
-
- if (s.isLoading()) {
- _savedPos = _data[HOLMES]->_position;
- _savedPos._facing = _data[HOLMES]->_sequenceNumber;
- }
-}
-
} // End of namespace Sherlock
More information about the Scummvm-git-logs
mailing list