ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correction to last commits.

Browse Source 
svn-id: r17700
This commit is contained in:
Travis Howell
2005-04-20 01:42:55 +00:00
parent fa3688e80f
commit ea8d2a0fd0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/script.cpp
+2 -2
View File
@@ -360,7 +360,7 @@ void ScummEngine::updateScriptPtr() {
void ScummEngine::nukeArrays(byte scriptSlot) {
int i;
if (_heversion < 60 || scriptSlot == 0)
if (_heversion == 0 || scriptSlot == 0)
return;
for (i = 1; i < _numArray; i++) {
@@ -584,7 +584,7 @@ void ScummEngine::writeVar(uint var, int value) {
// stay in sync with loom cd subtitle var
if ((_gameId == GID_LOOM256 || _heversion >= 60) && var == VAR_NOSUBTITLES) {
assert(value == 0 || value == 1);
if (_heversion == 60 && vm.slot[_currentScript].number == 1)
if (_heversion <= 61 && vm.slot[_currentScript].number == 1)
value = !ConfMan.getBool("subtitles");
else
ConfMan.set("subtitles", (value == 0));
scumm/scumm.h
-1
View File
@@ -115,7 +115,6 @@ enum GameFeatures {
GF_FEW_LOCALS = 1 << 13,
/** Games made by Humongous Entertainment. */
GF_HUMONGOUS = 1 << 14,
GF_MULTIPLE_VERSIONS = 1 << 15,
GF_FMTOWNS = 1 << 17,