diff options
| -rw-r--r-- | engines/sludge/builtin.cpp | 6 | ||||
| -rw-r--r-- | engines/sludge/loadsave.cpp | 7 | ||||
| -rw-r--r-- | engines/sludge/sludger.cpp | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp index d6cfbb53fe..8cba903d5c 100644 --- a/engines/sludge/builtin.cpp +++ b/engines/sludge/builtin.cpp @@ -60,7 +60,6 @@ Variable *launchResult = NULL; extern int lastFramesPerSecond, thumbWidth, thumbHeight; extern bool allowAnyFilename; -extern bool captureAllKeys; extern VariableStack *noStack; extern StatusStuff *nowStatus; extern ScreenRegion *overRegion; @@ -1991,9 +1990,10 @@ builtIn(transitionLevel) { builtIn(captureAllKeys) { UNUSEDALL - captureAllKeys = getBoolean(fun->stack->thisVar); + // This built-in function doesn't have any effect any more, we capture all keys by default + bool captureAllKeysDeprecated = getBoolean(fun->stack->thisVar); trimStack(fun->stack); - setVariable(fun->reg, SVT_INT, captureAllKeys); + setVariable(fun->reg, SVT_INT, captureAllKeysDeprecated); return BR_CONTINUE; } diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp index 2a69d02280..01ee1474b1 100644 --- a/engines/sludge/loadsave.cpp +++ b/engines/sludge/loadsave.cpp @@ -62,7 +62,6 @@ extern Floor *currentFloor; // In floor.cpp extern FILETIME fileTime; // In sludger.cpp extern byte brightnessLevel; // " " " extern byte fadeMode; // In transition.cpp -extern bool captureAllKeys; extern bool allowAnyFilename; extern uint16 saveEncoding; // in savedata.cpp @@ -359,7 +358,7 @@ bool saveGame(const Common::String &fname) { // DON'T ADD ANYTHING NEW BEFORE THIS POINT! fp->writeByte(allowAnyFilename); - fp->writeByte(captureAllKeys); + fp->writeByte(false); // deprecated captureAllKeys fp->writeByte(true); g_sludge->_txtMan->saveFont(fp); @@ -498,8 +497,8 @@ bool loadGame(const Common::String &fname) { if (ssgVersion >= VERSION(1, 4)) { allowAnyFilename = fp->readByte(); } - captureAllKeys = fp->readByte(); - fp->readByte(); // updateDisplay (part of movie playing) + fp->readByte(); // deprecated captureAllKeys + fp->readByte(); // updateDisplay (part of movie playing) g_sludge->_txtMan->loadFont(ssgVersion, fp); diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp index 0da7f39427..01d3b1794e 100644 --- a/engines/sludge/sludger.cpp +++ b/engines/sludge/sludger.cpp @@ -67,7 +67,6 @@ int selectedLanguage = 0; int gameVersion; FILETIME fileTime; -bool captureAllKeys = false; byte brightnessLevel = 255; @@ -79,7 +78,6 @@ Variable *globalVars; int numGlobals = 0; -extern SpritePalette pastePalette; extern Variable *launchResult; extern int lastFramesPerSecond, thumbWidth, thumbHeight; @@ -171,7 +169,6 @@ void initSludge() { lastFramesPerSecond = -1; thumbWidth = thumbHeight = 0; allowAnyFilename = true; - captureAllKeys = false; noStack = nullptr; numBIFNames = numUserFunc = 0; allUserFunc = allBIFNames = nullptr; |