thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: RT: Cleanup and fleshing out of saving

Browse source
This commit is contained in:
Paul Gilbert 2015-07-05 19:16:54 -04:00
parent 2466302903
commit 8570f052a3
10 changed files with 98 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

20
engines/sherlock/journal.cpp
View file

@ -683,4 +683,24 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
}
}
void Journal::synchronize(Serializer &s) {
s.syncAsSint16LE(_index);
s.syncAsSint16LE(_sub);
s.syncAsSint16LE(_page);
s.syncAsSint16LE(_maxPage);
int journalCount = _journal.size();
s.syncAsUint16LE(journalCount);
if (s.isLoading())
_journal.resize(journalCount);
for (uint idx = 0; idx < _journal.size(); ++idx) {
JournalEntry &je = _journal[idx];
s.syncAsSint16LE(je._converseNum);
s.syncAsByte(je._replyOnly);
s.syncAsSint16LE(je._statementNum);
}
}
} // End of namespace Sherlock

10
engines/sherlock/journal.h
View file

@ -77,6 +77,11 @@ public:
* Displays a page of the journal at the current index
*/
bool drawJournal(int direction, int howFar);
/**
* Synchronize the data for a savegame
*/
void synchronize(Serializer &s);
public:
/**
* Draw the journal background, frame, and interface buttons
@ -93,11 +98,6 @@ public:
* Reset viewing position to the start of the journal
*/
virtual void resetPosition() {}
/**
* Synchronize the data for a savegame
*/
virtual void synchronize(Serializer &s) = 0;
};
} // End of namespace Sherlock

11
engines/sherlock/objects.cpp
View file

@ -918,6 +918,17 @@ void UseType::load3DO(Common::SeekableReadStream &s) {
_target = Common::String(buffer);
}
void UseType::synchronize(Serializer &s) {
s.syncString(_verb);
s.syncAsSint16LE(_cAnimNum);
s.syncAsSint16LE(_cAnimSpeed);
s.syncAsSint16LE(_useFlag);
for (int idx = 0; idx < 4; ++idx)
s.syncString(_names[idx]);
s.syncString(_target);
}
/*----------------------------------------------------------------*/
Object::Object(): BaseObject() {

6
engines/sherlock/objects.h
View file

@ -29,6 +29,7 @@
#include "common/str.h"
#include "sherlock/image_file.h"
#include "sherlock/fixed_text.h"
#include "sherlock/saveload.h"
namespace Sherlock {
@ -176,6 +177,11 @@ struct UseType: public ActionType {
*/
void load(Common::SeekableReadStream &s, bool isRoseTattoo);
void load3DO(Common::SeekableReadStream &s);
/**
* Synchronize the data for a savegame
*/
void synchronize(Serializer &s);
};
class BaseObject {

20
engines/sherlock/scalpel/scalpel_journal.cpp
View file

@ -662,26 +662,6 @@ void ScalpelJournal::resetPosition() {
_page = 1;
}
void ScalpelJournal::synchronize(Serializer &s) {
s.syncAsSint16LE(_index);
s.syncAsSint16LE(_sub);
s.syncAsSint16LE(_page);
s.syncAsSint16LE(_maxPage);
int journalCount = _journal.size();
s.syncAsUint16LE(journalCount);
if (s.isLoading())
_journal.resize(journalCount);
for (uint idx = 0; idx < _journal.size(); ++idx) {
JournalEntry &je = _journal[idx];
s.syncAsSint16LE(je._converseNum);
s.syncAsByte(je._replyOnly);
s.syncAsSint16LE(je._statementNum);
}
}
} // End of namespace Scalpel
} // End of namespace Sherlock

5
engines/sherlock/scalpel/scalpel_journal.h
View file

@ -93,11 +93,6 @@ public:
* Reset viewing position to the start of the journal
*/
virtual void resetPosition();
/**
* Synchronize the data for a savegame
*/
virtual void synchronize(Serializer &s);
};
} // End of namespace Scalpel

4
engines/sherlock/tattoo/tattoo_journal.cpp
View file

@ -428,10 +428,6 @@ void TattooJournal::drawFrame() {
}
void TattooJournal::synchronize(Serializer &s) {
// TODO
}
void TattooJournal::drawControls(int mode) {
TattooEngine &vm = *(TattooEngine *)_vm;
Screen &screen = *_vm->_screen;

5
engines/sherlock/tattoo/tattoo_journal.h
View file

@ -94,11 +94,6 @@ public:
* Draw the journal background, frame, and interface buttons
*/
virtual void drawFrame();
/**
* Synchronize the data for a savegame
*/
virtual void synchronize(Serializer &s);
};
} // End of namespace Tattoo

61
engines/sherlock/tattoo/tattoo_people.cpp
View file

@ -967,6 +967,55 @@ void TattooPerson::checkWalkGraphics() {
setImageFrame();
}
void TattooPerson::synchronize(Serializer &s) {
s.syncAsSint32LE(_position.x);
s.syncAsSint32LE(_position.y);
s.syncAsSint16LE(_sequenceNumber);
s.syncAsSint16LE(_type);
s.syncString(_walkVGSName);
s.syncString(_description);
s.syncString(_examine);
// NPC specific properties
s.syncBytes(&_npcPath[0], MAX_NPC_PATH);
s.syncString(_npcName);
s.syncAsSint32LE(_npcPause);
s.syncAsByte(_lookHolmes);
s.syncAsByte(_updateNPCPath);
// Walk to list
uint count = _walkTo.size();
s.syncAsUint16LE(count);
if (s.isLoading()) {
// Load path
for (uint idx = 0; idx < count; ++count) {
int xp = 0, yp = 0;
s.syncAsSint16LE(xp);
s.syncAsSint16LE(yp);
_walkTo.push(Common::Point(xp, yp));
}
} else {
// Save path
Common::Array<Common::Point> path;
// Save the points of the path
for (uint idx = 0; idx < count; ++idx) {
Common::Point pt = _walkTo.pop();
s.syncAsSint16LE(pt.x);
s.syncAsSint16LE(pt.y);
path.push_back(pt);
}
// Re-add the pending points back to the _walkTo queue
for (uint idx = 0; idx < count; ++idx)
_walkTo.push(path[idx]);
}
// Verbs
for (int idx = 0; idx < 2; ++idx)
_use[idx].synchronize(s);
}
/*----------------------------------------------------------------*/
TattooPeople::TattooPeople(SherlockEngine *vm) : People(vm) {
@ -1176,16 +1225,8 @@ int TattooPeople::findSpeaker(int speaker) {
void TattooPeople::synchronize(Serializer &s) {
s.syncAsByte(_holmesOn);
for (uint idx = 0; idx < _data.size(); ++idx) {
Person &p = *_data[idx];
s.syncAsSint32LE(p._position.x);
s.syncAsSint32LE(p._position.y);
s.syncAsSint16LE(p._sequenceNumber);
s.syncAsSint16LE(p._type);
s.syncString(p._walkVGSName);
s.syncString(p._description);
s.syncString(p._examine);
}
for (uint idx = 0; idx < _data.size(); ++idx)
(*this)[idx].synchronize(s);
s.syncAsSint16LE(_holmesQuotient);

5
engines/sherlock/tattoo/tattoo_people.h
View file

@ -172,6 +172,11 @@ public:
*/
void checkWalkGraphics();
/**
* Synchronize the data for a savegame
*/
void synchronize(Serializer &s);
/**
* This adjusts the sprites position, as well as it's animation sequence:
*/