Skip to content

Commit

Permalink
WINTERMUTE: Redo the way floats are saved, break savegame compatibili…
Browse files Browse the repository at this point in the history 
…ty with WME Lite completely.

(This also breaks compatibility with savegames from ScummVM prior to this commit, AND resets the
Savegame-version, older savegames will have differing MAGIC-numbers in their headers, and will thus
not be recognized).
  • Loading branch information
@somaen
somaen committed Jan 31, 2013
1 parent 9a40cdc commit 0407906
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 56 deletions.
3 changes: 1 addition & 2 deletions engines/wintermute/base/base_game.cpp
View file
Expand Up @@ -3207,6 +3207,7 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_lastTime));
persistMgr->transfer(TMEMBER(_mainObject));
_musicSystem->persistChannels(persistMgr);
_musicSystem->persistCrossfadeSettings(persistMgr);

persistMgr->transfer(TMEMBER(_offsetX));
persistMgr->transfer(TMEMBER(_offsetY));
Expand Down Expand Up @@ -3238,8 +3239,6 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_liveTimerDelta));
persistMgr->transfer(TMEMBER(_liveTimerLast));

_musicSystem->persistCrossfadeSettings(persistMgr);

_renderer->persistSaveLoadImages(persistMgr);

persistMgr->transfer(TMEMBER_INT(_textEncoding));
Expand Down
98 changes: 48 additions & 50 deletions engines/wintermute/base/base_persistence_manager.cpp
View file
Expand Up @@ -47,17 +47,17 @@

namespace Wintermute {

#define SAVE_BUFFER_INIT_SIZE 100000
#define SAVE_BUFFER_GROW_BY 50000

#define SAVE_MAGIC 0x45564153
#define SAVE_MAGIC_2 0x32564153
// The original WME-Lite savegames had the following:
//#define SAVE_MAGIC 0x45564153
//#define SAVE_MAGIC_2 0x32564153
// In case anyone tries to load original savegames, or for that matter
// in case we ever want to attempt to support original savegames, we
// avoid those numbers, and use this instead:
#define SAVE_MAGIC_3 0x12564154

//////////////////////////////////////////////////////////////////////////
BasePersistenceManager::BasePersistenceManager(const char *savePrefix, bool deleteSingleton) {
_saving = false;
// _buffer = nullptr;
// _bufferSize = 0;
_offset = 0;
_saveStream = nullptr;
_loadStream = nullptr;
Expand Down Expand Up @@ -101,13 +101,6 @@ BasePersistenceManager::~BasePersistenceManager() {

//////////////////////////////////////////////////////////////////////////
void BasePersistenceManager::cleanup() {
/* if (_buffer) {
if (_saving) free(_buffer);
else delete[] _buffer; // allocated by file manager
}
_buffer = nullptr;
_bufferSize = 0;*/
_offset = 0;

delete[] _richBuffer;
Expand Down Expand Up @@ -147,7 +140,7 @@ void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &des
Common::String filename = getFilenameForSlot(slot);
debugC(kWintermuteDebugSaveGame, "Trying to list savegame %s in slot %d", filename.c_str(), slot);
if (DID_FAIL(readHeader(filename))) {
warning("getSavedDesc(%d) - Failed for %s", slot, filename.c_str());
debugC(kWintermuteDebugSaveGame, "getSavedDesc(%d) - Failed for %s", slot, filename.c_str());
return;
}
desc.setSaveSlot(slot);
Expand Down Expand Up @@ -235,12 +228,11 @@ bool BasePersistenceManager::initSave(const char *desc) {
uint32 magic = DCGF_MAGIC;
putDWORD(magic);

magic = SAVE_MAGIC_2;
magic = SAVE_MAGIC_3;
putDWORD(magic);

byte verMajor, verMinor, extMajor, extMinor;
_gameRef->getVersion(&verMajor, &verMinor, &extMajor, &extMinor);
//uint32 version = MAKELONG(MAKEWORD(VerMajor, VerMinor), MAKEWORD(ExtMajor, ExtMinor));
_saveStream->writeByte(verMajor);
_saveStream->writeByte(verMinor);
_saveStream->writeByte(extMajor);
Expand Down Expand Up @@ -315,7 +307,7 @@ bool BasePersistenceManager::readHeader(const Common::String &filename) {
_saving = false;

_loadStream = g_system->getSavefileManager()->openForLoading(filename);
//_buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename, &_bufferSize);

if (_loadStream) {
uint32 magic;
magic = getDWORD();
Expand All @@ -327,37 +319,32 @@ bool BasePersistenceManager::readHeader(const Common::String &filename) {

magic = getDWORD();

if (magic == SAVE_MAGIC || magic == SAVE_MAGIC_2) {
if (magic == SAVE_MAGIC_3) {
_savedVerMajor = _loadStream->readByte();
_savedVerMinor = _loadStream->readByte();
_savedExtMajor = _loadStream->readByte();
_savedExtMinor = _loadStream->readByte();

if (magic == SAVE_MAGIC_2) {
_savedVerBuild = (byte)getDWORD();
_savedName = getStringObj();

// load thumbnail
_thumbnailDataSize = getDWORD();
if (_thumbnailDataSize > 0) {
_thumbnailData = new byte[_thumbnailDataSize];
if (_thumbnailData) {
getBytes(_thumbnailData, _thumbnailDataSize);
} else {
_thumbnailDataSize = 0;
}
}
if (_savedVerMajor >= 1 && _savedVerMinor >= 2) {
_scummVMThumbSize = getDWORD();
_scummVMThumbnailData = new byte[_scummVMThumbSize];
if (_scummVMThumbnailData) {
getBytes(_scummVMThumbnailData, _scummVMThumbSize);
} else {
_scummVMThumbSize = 0;
}
_savedVerBuild = (byte)getDWORD();
_savedName = getStringObj();

// load thumbnail
_thumbnailDataSize = getDWORD();
if (_thumbnailDataSize > 0) {
_thumbnailData = new byte[_thumbnailDataSize];
if (_thumbnailData) {
getBytes(_thumbnailData, _thumbnailDataSize);
} else {
_thumbnailDataSize = 0;
}
}

_scummVMThumbSize = getDWORD();
_scummVMThumbnailData = new byte[_scummVMThumbSize];
if (_scummVMThumbnailData) {
getBytes(_scummVMThumbnailData, _scummVMThumbSize);
} else {
_savedVerBuild = 35; // last build with ver1 savegames
_scummVMThumbSize = 0;
}

uint32 dataOffset = getDWORD();
Expand Down Expand Up @@ -515,7 +502,7 @@ bool BasePersistenceManager::putTimeDate(const TimeDate &t) {
_saveStream->writeSint32LE(t.tm_mday);
_saveStream->writeSint32LE(t.tm_mon);
_saveStream->writeSint32LE(t.tm_year);
// _saveStream->writeSint32LE(t.tm_wday); //TODO: Add this in when merging next
_saveStream->writeSint32LE(t.tm_wday); //TODO: Add this in when merging next

if (_saveStream->err()) {
return STATUS_FAILED;
Expand All @@ -531,20 +518,26 @@ TimeDate BasePersistenceManager::getTimeDate() {
t.tm_mday = _loadStream->readSint32LE();
t.tm_mon = _loadStream->readSint32LE();
t.tm_year = _loadStream->readSint32LE();
// t.tm_wday = _loadStream->readSint32LE(); //TODO: Add this in when merging next
t.tm_wday = _loadStream->readSint32LE(); //TODO: Add this in when merging next
return t;
}

void BasePersistenceManager::putFloat(float val) {
Common::String str = Common::String::format("F%f", val);
int32 exponent = 0;
float significand = frexpf(val, &exponent);
Common::String str = Common::String::format("FS%f", significand);
_saveStream->writeUint32LE(str.size());
_saveStream->writeString(str);
_saveStream->writeSint32LE(exponent);
}

float BasePersistenceManager::getFloat() {
char *str = getString();
float value = 0.0f;
int ret = sscanf(str, "F%f", &value);
float significand = 0.0f;
int32 exponent = _loadStream->readSint32LE();
int ret = sscanf(str, "FS%f", &significand);
value = ldexpf(significand, exponent);
if (ret != 1) {
warning("%s not parsed as float", str);
}
Expand All @@ -553,16 +546,21 @@ float BasePersistenceManager::getFloat() {
}

void BasePersistenceManager::putDouble(double val) {
Common::String str = Common::String::format("D%f", val);
str.format("D%f", val);
int32 exponent = 0;
double significand = frexp(val, &exponent);
Common::String str = Common::String::format("DS%f", significand);
_saveStream->writeUint32LE(str.size());
_saveStream->writeString(str);
_saveStream->writeSint32LE(exponent);
}

double BasePersistenceManager::getDouble() {
char *str = getString();
float value = 0.0f; // TODO: Do we ever really need to carry a full double-precision number?
int ret = sscanf(str, "D%f", &value);
double value = 0.0f;
float significand = 0.0f;
int32 exponent = _loadStream->readSint32LE();
int ret = sscanf(str, "DS%f", &significand);
value = ldexp(significand, exponent);
if (ret != 1) {
warning("%s not parsed as double", str);
}
Expand Down
2 changes: 1 addition & 1 deletion engines/wintermute/base/scriptables/script_value.cpp
View file
Expand Up @@ -827,7 +827,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_valRef));
persistMgr->transfer(TMEMBER(_valString));

/*
/* // TODO: Convert to Debug-statements.
FILE* f = fopen("c:\\val.log", "a+");
switch(_type)
{
Expand Down
6 changes: 3 additions & 3 deletions engines/wintermute/dcgf.h
View file
Expand Up @@ -32,12 +32,12 @@

//////////////////////////////////////////////////////////////////////////
#define DCGF_VER_MAJOR 1
#define DCGF_VER_MINOR 2
#define DCGF_VER_MINOR 1
#define DCGF_VER_BUILD 1
#define DCGF_VER_SUFFIX "beta"
#define DCGF_VER_SUFFIX "ScummVM"
#define DCGF_VER_BETA true

#define DCGF_NAME "WME Lite"
#define DCGF_NAME "WME-ScummVM"
#define DCGF_MAGIC 0xDEC0ADDE

// minimal saved game version we support
Expand Down

0 comments on commit 0407906

Please sign in to comment.