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

Enable and use VAR_VOICE_MODE

Browse source 
svn-id: r12979
This commit is contained in:
Travis Howell 2004-02-22 03:08:18 +00:00
parent ff93447108
commit 42028e984f
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/saveload.cpp
View file

@ -200,6 +200,10 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) {
_scummVars[VAR_CAMERA_ACCEL_Y] = _scummVars[110]; _scummVars[VAR_CAMERA_ACCEL_Y] = _scummVars[110];
} }
// Sync with current config setting
if (_version >= 7)
VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
// We could simply dirty colours 0-15 for 16-colour games -- nowadays // We could simply dirty colours 0-15 for 16-colour games -- nowadays
// they handle their palette pretty much like the more recent games // they handle their palette pretty much like the more recent games
// anyway. There was a time, though, when re-initializing was necessary // anyway. There was a time, though, when re-initializing was necessary

1
scumm/scumm.h
View file

@ -1223,6 +1223,7 @@ public:
byte VAR_CLICK_AREA; byte VAR_CLICK_AREA;
byte VAR_BLAST_ABOVE_TEXT; byte VAR_BLAST_ABOVE_TEXT;
byte VAR_VOICE_MODE;
}; };
// This is a constant lookup table of reverse bit masks // This is a constant lookup table of reverse bit masks

4
scumm/scummvm.cpp
View file

@ -618,6 +618,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
VAR_CLICK_AREA = 0xFF; VAR_CLICK_AREA = 0xFF;
VAR_BLAST_ABOVE_TEXT = 0xFF; VAR_BLAST_ABOVE_TEXT = 0xFF;
VAR_VOICE_MODE = 0xFF;
// Use g_scumm from error() ONLY // Use g_scumm from error() ONLY
g_scumm = this; g_scumm = this;
@ -1200,6 +1201,9 @@ void ScummEngine::initScummVars() {
VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen; VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen;
} }
if (_version >= 7)
VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
VAR(VAR_CHARINC) = 4; VAR(VAR_CHARINC) = 4;
talkingActor(0); talkingActor(0);
} }

4
scumm/vars.cpp
View file

@ -194,7 +194,7 @@ void ScummEngine_v7::setupScummVars() {
VAR_PERFORMANCE_2 = 27; VAR_PERFORMANCE_2 = 27;
VAR_GAME_LOADED = 29; VAR_GAME_LOADED = 29;
VAR_V6_EMSSPACE = 32; VAR_V6_EMSSPACE = 32;
//VAR_VOICE_MODE = 33; // 0 is voice, 1 is voice+text, 2 is text only VAR_VOICE_MODE = 33; // 0 is voice, 1 is voice+text, 2 is text only
VAR_RANDOM_NR = 34; VAR_RANDOM_NR = 34;
VAR_NEW_ROOM = 35; VAR_NEW_ROOM = 35;
VAR_WALKTO_OBJ = 36; VAR_WALKTO_OBJ = 36;
@ -292,7 +292,7 @@ void ScummEngine_v8::setupScummVars() {
VAR_NEW_ROOM = 32; VAR_NEW_ROOM = 32;
VAR_WALKTO_OBJ = 33; VAR_WALKTO_OBJ = 33;
//VAR_VOICE_MODE = 39; // 0 is voice, 1 is voice+text, 2 is text only VAR_VOICE_MODE = 39; // 0 is voice, 1 is voice+text, 2 is text only
VAR_GAME_LOADED = 40; VAR_GAME_LOADED = 40;
VAR_LANGUAGE = 41; VAR_LANGUAGE = 41;