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

KYRA: (EOB) - fix original savefile import/export

Browse source 
(flag settings were not imported/exported in EOB 1 saves)
This commit is contained in:
athrxx 2013-04-27 15:35:48 +02:00
parent be7486ffef
commit c3a7e01807
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/kyra/script_eob.cpp
View file

@ -216,21 +216,25 @@ bool EoBInfProcessor::preventRest() const {
void EoBInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in, bool origFile) { void EoBInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in, bool origFile) {
_preventRest = (_vm->game() == GI_EOB1 && origFile) ? 0 : in.readByte(); _preventRest = (_vm->game() == GI_EOB1 && origFile) ? 0 : in.readByte();
int numFlags = (_vm->game() == GI_EOB1 && origFile) ? 13 : 18; int numFlags = (_vm->game() == GI_EOB1 && origFile) ? 12 : 18;
for (int i = 0; i < numFlags; i++) for (int i = 0; i < numFlags; i++)
_flagTable[i] = in.readUint32(); _flagTable[i] = in.readUint32();
if (_vm->game() == GI_EOB1 && origFile)
setFlags(in.readUint32());
} }
void EoBInfProcessor::saveState(Common::OutSaveFile *out, bool origFile) { void EoBInfProcessor::saveState(Common::OutSaveFile *out, bool origFile) {
if (_vm->game() == GI_EOB2 || !origFile) if (_vm->game() == GI_EOB2 || !origFile)
out->writeByte(_preventRest); out->writeByte(_preventRest);
int numFlags = (_vm->game() == GI_EOB1 && origFile) ? 13 : 18; int numFlags = (_vm->game() == GI_EOB1 && origFile) ? 12 : 18;
for (int i = 0; i < numFlags; i++) { for (int i = 0; i < numFlags; i++) {
if (origFile) if (origFile)
out->writeUint32LE(_flagTable[i]); out->writeUint32LE(_flagTable[i]);
else else
out->writeUint32BE(_flagTable[i]); out->writeUint32BE(_flagTable[i]);
} }
if (_vm->game() == GI_EOB1 && origFile)
out->writeUint32LE(_flagTable[17]);
} }
void EoBInfProcessor::reset() { void EoBInfProcessor::reset() {