libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HE60/61 still VAR_NOSUBTITLES.

Browse Source 
Typo.

svn-id: r17990
This commit is contained in:
Travis Howell 2005-05-09 02:59:45 +00:00
parent 69d000d2d0
commit cc5caba793
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scumm/script.cpp
View File

@ -508,7 +508,7 @@ int ScummEngine::readVar(uint var) {
if (VAR_SUBTITLES != 0xFF && var == VAR_SUBTITLES) {
return ConfMan.getBool("subtitles");
}
if (VAR_SUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
if (VAR_NOSUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
return !ConfMan.getBool("subtitles");
}
@ -574,13 +574,13 @@ void ScummEngine::writeVar(uint var, int value) {
checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
if (VAR_SUBTITLES != 0xFF && var == VAR_SUBTITLES) {
// Ignore default setting in HE60/61 games
if (_heversion <= 61 && vm.slot[_currentScript].number == 1)
return;
assert(value == 0 || value == 1);
ConfMan.set("subtitles", value);
}
if (VAR_NOSUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
// Ignore default setting in HE60/61 games
if ((_heversion >= 60 && _heversion <= 61) && vm.slot[_currentScript].number == 1)
return;
assert(value == 0 || value == 1);
ConfMan.set("subtitles", !value);
}

6
scumm/vars.cpp
View File

@ -167,7 +167,11 @@ void ScummEngine_v6::setupScummVars() {
VAR_ROOM_WIDTH = 41;
VAR_ROOM_HEIGHT = 54;
VAR_SUBTITLES = 60;
if (_heversion >= 60 && _heversion <= 61) {
VAR_NOSUBTITLES = 60;
} else {
VAR_SUBTITLES = 60;
}
VAR_LEFTBTN_HOLD = 74;
VAR_RIGHTBTN_HOLD = 75;