aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-10-29 16:28:22 +0000
committerJohannes Schickel2010-10-29 16:28:22 +0000
commit6aec3882a453c0667c4596d9212a8150fc6093ee (patch)
tree90284e6459ad894d121f358a46f04f20e10e4a56
parent5cfb461b5b340e5f95134fcc10a8ae21af59f2a6 (diff)
downloadscummvm-rg350-6aec3882a453c0667c4596d9212a8150fc6093ee.tar.gz
scummvm-rg350-6aec3882a453c0667c4596d9212a8150fc6093ee.tar.bz2
scummvm-rg350-6aec3882a453c0667c4596d9212a8150fc6093ee.zip
SCI: Remove unused variable + some formatting fixes.
svn-id: r53921
-rw-r--r--engines/sci/sci.cpp37
1 files changed, 18 insertions, 19 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 839e033169..82542851ca 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -303,10 +303,10 @@ Common::Error SciEngine::run() {
if (buggyScript && (buggyScript->size == 12354 || buggyScript->size == 12362)) {
showScummVMDialog("A known buggy game script has been detected, which could "
- "prevent you from progressing later on in the game, during "
- "the sequence with the Green Man's riddles. Please, apply "
- "the latest patch for this game by Sierra to avoid possible "
- "problems");
+ "prevent you from progressing later on in the game, during "
+ "the sequence with the Green Man's riddles. Please, apply "
+ "the latest patch for this game by Sierra to avoid possible "
+ "problems");
}
}
@@ -325,16 +325,16 @@ Common::Error SciEngine::run() {
case GID_SQ4:
case GID_FAIRYTALES:
showScummVMDialog("You have selected General MIDI as a sound device. Sierra "
- "has provided after-market support for General MIDI for this "
- "game in their \"General MIDI Utility\". Please, apply this "
- "patch in order to enjoy MIDI music with this game. Once you "
- "have obtained it, you can unpack all of the included *.PAT "
- "files in your ScummVM extras folder and ScummVM will add the "
- "appropriate patch automatically. Alternatively, you can follow "
- "the instructions in the READ.ME file included in the patch and "
- "rename the associated *.PAT file to 4.PAT and place it in the "
- "game folder. Without this patch, General MIDI music for this "
- "game will sound badly distorted.");
+ "has provided after-market support for General MIDI for this "
+ "game in their \"General MIDI Utility\". Please, apply this "
+ "patch in order to enjoy MIDI music with this game. Once you "
+ "have obtained it, you can unpack all of the included *.PAT "
+ "files in your ScummVM extras folder and ScummVM will add the "
+ "appropriate patch automatically. Alternatively, you can follow "
+ "the instructions in the READ.ME file included in the patch and "
+ "rename the associated *.PAT file to 4.PAT and place it in the "
+ "game folder. Without this patch, General MIDI music for this "
+ "game will sound badly distorted.");
break;
default:
break;
@@ -344,10 +344,10 @@ Common::Error SciEngine::run() {
if (gameHasFanMadePatch()) {
showScummVMDialog("Your game is patched with a fan made script patch. Such patches have "
- "been reported to cause issues, as they modify game scripts extensively. "
- "The issues that these patches fix do not occur in ScummVM, so you are "
- "advised to remove this patch from your game folder in order to avoid "
- "having unexpected errors and/or issues later on.");
+ "been reported to cause issues, as they modify game scripts extensively. "
+ "The issues that these patches fix do not occur in ScummVM, so you are "
+ "advised to remove this patch from your game folder in order to avoid "
+ "having unexpected errors and/or issues later on.");
}
runGame();
@@ -407,7 +407,6 @@ bool SciEngine::gameHasFanMadePatch() {
Resource *targetScript = _resMan->findResource(ResourceId(kResourceTypeScript, patchInfo[curEntry].targetScript), 0);
if (targetScript && targetScript->size + 2 == patchInfo[curEntry].targetSize) {
- byte foo = targetScript->data[patchInfo[curEntry].patchedByteOffset];
if (patchInfo[curEntry].patchedByteOffset == 0)
return true;
else if (targetScript->data[patchInfo[curEntry].patchedByteOffset - 2] == patchInfo[curEntry].patchedByte)