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

TSAGE: Rename savegame header members

Browse source
This commit is contained in:
Strangerke 2014-03-07 14:21:09 +01:00
parent da157fbccc
commit dc2094f7a6
3 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/tsage/detection.cpp
View file

@ -129,10 +129,10 @@ public:
if (in) { if (in) {
if (TsAGE::Saver::readSavegameHeader(in, header)) { if (TsAGE::Saver::readSavegameHeader(in, header)) {
saveList.push_back(SaveStateDescriptor(slot, header.saveName)); saveList.push_back(SaveStateDescriptor(slot, header._saveName));
header.thumbnail->free(); header._thumbnail->free();
delete header.thumbnail; delete header._thumbnail;
} }
delete in; delete in;
@ -162,11 +162,11 @@ public:
delete f; delete f;
// Create the return descriptor // Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName); SaveStateDescriptor desc(slot, header._saveName);
desc.setThumbnail(header.thumbnail); desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay); desc.setSaveDate(header._saveYear, header._saveMonth, header._saveDay);
desc.setSaveTime(header.saveHour, header.saveMinutes); desc.setSaveTime(header._saveHour, header._saveMinutes);
desc.setPlayTime(header.totalFrames * GAME_FRAME_TIME); desc.setPlayTime(header._totalFrames * GAME_FRAME_TIME);
return desc; return desc;
} }

40
engines/tsage/saveload.cpp
View file

@ -141,8 +141,8 @@ Common::Error Saver::save(int slot, const Common::String &saveName) {
// Write out the savegame header // Write out the savegame header
tSageSavegameHeader header; tSageSavegameHeader header;
header.saveName = saveName; header._saveName = saveName;
header.version = TSAGE_SAVEGAME_VERSION; header._version = TSAGE_SAVEGAME_VERSION;
writeSavegameHeader(saveFile, header); writeSavegameHeader(saveFile, header);
// Save out objects that need to come at the start of the savegame // Save out objects that need to come at the start of the savegame
@ -190,11 +190,11 @@ Common::Error Saver::restore(int slot) {
// Read in the savegame header // Read in the savegame header
tSageSavegameHeader header; tSageSavegameHeader header;
readSavegameHeader(saveFile, header); readSavegameHeader(saveFile, header);
if (header.thumbnail) if (header._thumbnail)
header.thumbnail->free(); header._thumbnail->free();
delete header.thumbnail; delete header._thumbnail;
serializer.setSaveVersion(header.version); serializer.setSaveVersion(header._version);
// Load in data for objects that need to come at the start of the savegame // Load in data for objects that need to come at the start of the savegame
for (Common::List<SaveListener *>::iterator i = _listeners.begin(); i != _listeners.end(); ++i) { for (Common::List<SaveListener *>::iterator i = _listeners.begin(); i != _listeners.end(); ++i) {
@ -242,34 +242,34 @@ const char *SAVEGAME_STR = "SCUMMVM_TSAGE";
bool Saver::readSavegameHeader(Common::InSaveFile *in, tSageSavegameHeader &header) { bool Saver::readSavegameHeader(Common::InSaveFile *in, tSageSavegameHeader &header) {
char saveIdentBuffer[SAVEGAME_STR_SIZE + 1]; char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
header.thumbnail = NULL; header._thumbnail = NULL;
// Validate the header Id // Validate the header Id
in->read(saveIdentBuffer, SAVEGAME_STR_SIZE + 1); in->read(saveIdentBuffer, SAVEGAME_STR_SIZE + 1);
if (strncmp(saveIdentBuffer, SAVEGAME_STR, SAVEGAME_STR_SIZE)) if (strncmp(saveIdentBuffer, SAVEGAME_STR, SAVEGAME_STR_SIZE))
return false; return false;
header.version = in->readByte(); header._version = in->readByte();
if (header.version > TSAGE_SAVEGAME_VERSION) if (header._version > TSAGE_SAVEGAME_VERSION)
return false; return false;
// Read in the string // Read in the string
header.saveName.clear(); header._saveName.clear();
char ch; char ch;
while ((ch = (char)in->readByte()) != '\0') header.saveName += ch; while ((ch = (char)in->readByte()) != '\0') header._saveName += ch;
// Get the thumbnail // Get the thumbnail
header.thumbnail = Graphics::loadThumbnail(*in); header._thumbnail = Graphics::loadThumbnail(*in);
if (!header.thumbnail) if (!header._thumbnail)
return false; return false;
// Read in save date/time // Read in save date/time
header.saveYear = in->readSint16LE(); header._saveYear = in->readSint16LE();
header.saveMonth = in->readSint16LE(); header._saveMonth = in->readSint16LE();
header.saveDay = in->readSint16LE(); header._saveDay = in->readSint16LE();
header.saveHour = in->readSint16LE(); header._saveHour = in->readSint16LE();
header.saveMinutes = in->readSint16LE(); header._saveMinutes = in->readSint16LE();
header.totalFrames = in->readUint32LE(); header._totalFrames = in->readUint32LE();
return true; return true;
} }
@ -281,7 +281,7 @@ void Saver::writeSavegameHeader(Common::OutSaveFile *out, tSageSavegameHeader &h
out->writeByte(TSAGE_SAVEGAME_VERSION); out->writeByte(TSAGE_SAVEGAME_VERSION);
// Write savegame name // Write savegame name
out->write(header.saveName.c_str(), header.saveName.size() + 1); out->write(header._saveName.c_str(), header._saveName.size() + 1);
// Get the active palette // Get the active palette
uint8 thumbPalette[256 * 3]; uint8 thumbPalette[256 * 3];

12
engines/tsage/saveload.h
View file

@ -38,12 +38,12 @@ typedef void (*SaveNotifierFn)(bool postFlag);
class SavedObject; class SavedObject;
struct tSageSavegameHeader { struct tSageSavegameHeader {
uint8 version; uint8 _version;
Common::String saveName; Common::String _saveName;
Graphics::Surface *thumbnail; Graphics::Surface *_thumbnail;
int saveYear, saveMonth, saveDay; int _saveYear, _saveMonth, _saveDay;
int saveHour, saveMinutes; int _saveHour, _saveMinutes;
int totalFrames; int _totalFrames;
}; };
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/