libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Got rid of ScummEngine::_confirmExit, and some other minor cleanup

Browse Source 
svn-id: r24319
This commit is contained in:
Max Horn 2006-10-15 00:50:22 +00:00
parent 9def30e302
commit 84874caf06
8 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/scumm/he/sound_he.cpp
View File

@ -50,6 +50,7 @@ SoundHE::SoundHE(ScummEngine *parent)
:
Sound(parent),
_vm((ScummEngine_v60he *)parent),
_overrideFreq(0),
_heMusic(0),
_heMusicTracks(0) {

2
engines/scumm/he/sound_he.h
View File

@ -33,6 +33,8 @@ class SoundHE : public Sound {
protected:
ScummEngine_v60he *_vm;
int _overrideFreq;
struct HEMusic {
int32 id;
int32 offset;

2
engines/scumm/input.cpp
View File

@ -182,7 +182,7 @@ void ScummEngine::parseEvents() {
break;
case OSystem::EVENT_QUIT:
if (_confirmExit)
if (ConfMan.getBool("confirm_exit"))
confirmExitDialog();
else
_quit = true;

2
engines/scumm/script_v8.cpp
View File

@ -1282,7 +1282,7 @@ void ScummEngine_v8::o8_kernelSetFunctions() {
debug(0, "o8_kernelSetFunctions: paletteSetIntensity(%d, %d)", args[1], args[2]);
break;
case 34: // queryQuit
if (_confirmExit)
if (ConfMan.getBool("confirm_exit"))
confirmExitDialog();
else
_quit = true;

5
engines/scumm/scumm.cpp
View File

@ -268,7 +268,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
_charsetBufPos = 0;
memset(_charsetBuffer, 0, sizeof(_charsetBuffer));
_copyProtection = false;
_confirmExit = false;
_voiceMode = 0;
_talkDelay = 0;
_NES_lastTalkingActor = 0;
@ -455,10 +454,8 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
else
_voiceMode = ConfMan.getBool("subtitles");
_confirmExit = ConfMan.getBool("confirm_exit");
if (ConfMan.hasKey("render_mode")) {
_renderMode = Common::parseRenderMode(ConfMan.get("render_mode").c_str());
_renderMode = Common::parseRenderMode(ConfMan.get("render_mode"));
} else {
_renderMode = Common::kRenderDefault;
}

1
engines/scumm/scumm.h
View File

@ -1132,7 +1132,6 @@ protected:
bool _enable_gs;
MidiDriverFlags _musicType;
bool _copyProtection;
bool _confirmExit;
public:
uint16 _extraBoxFlags[65];

1
engines/scumm/sound.cpp
View File

@ -74,7 +74,6 @@ Sound::Sound(ScummEngine *parent)
_mouthSyncMode(false),
_endOfMouthSync(false),
_curSoundPos(0),
_overrideFreq(0),
_currentCDSound(0),
_currentMusic(0),
_soundsPaused(false),

6
engines/scumm/sound.h
View File

@ -27,10 +27,6 @@
#include "sound/mixer.h"
#include "scumm/saveload.h"
namespace Common {
class File;
}
namespace Scumm {
class ScummEngine;
@ -79,8 +75,6 @@ protected:
uint16 _mouthSyncTimes[64];
uint _curSoundPos;
int _overrideFreq;
int16 _currentCDSound;
int16 _currentMusic;