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

The Kyra settings are now stored in the config file instead of the savegames.

Browse source 
The settings in older savegames are ignored.

svn-id: r22705
This commit is contained in:
Torbjörn Andersson 2006-05-28 09:21:32 +00:00
parent e06ee0c490
commit b17f0e8b6d
7 changed files with 118 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/kyra/saveload.cpp
View file

@ -30,7 +30,7 @@
#include "kyra/screen.h"
#include "kyra/resource.h"
#define CURRENT_VERSION 4
#define CURRENT_VERSION 5
namespace Kyra {
void KyraEngine::loadGame(const char *fileName) {
@ -179,13 +179,16 @@ void KyraEngine::loadGame(const char *fileName) {
if (_lastMusicCommand != -1)
snd_playWanderScoreViaMap(_lastMusicCommand, 1);
}
// Version 4 stored settings in the savegame. As of version 5, they are
// handled by the config manager.
if (version >= 4) {
_configTextspeed = in->readByte();
_configWalkspeed = in->readByte();
_configMusic = in->readByte() != 0;
_configSounds = in->readByte() != 0;
_configVoice = in->readByte();
if (version == 4) {
in->readByte(); // Text speed
in->readByte(); // Walk speed
in->readByte(); // Music
in->readByte(); // Sound
in->readByte(); // Voice
}
loadMainScreen(8);
@ -317,12 +320,6 @@ void KyraEngine::saveGame(const char *fileName, const char *saveName) {
out->writeSint16BE(_lastMusicCommand);
out->writeByte(_configTextspeed);
out->writeByte(_configWalkspeed);
out->writeByte(_configMusic);
out->writeByte(_configSounds);
out->writeByte(_configVoice);
out->flush();
// check for errors