diff options
author | Eugene Sandulenko | 2016-02-15 18:31:50 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2016-02-15 18:31:50 +0100 |
commit | 6c895643aa743bcb0f99841c580c9581648a2864 (patch) | |
tree | 543c2de776ef0d83d33bb3ceea8c2e7afbf58325 /engines/sci | |
parent | a0213fe06128d4bf34f7e47484c4130ae2543afa (diff) | |
parent | 6c298e964f7352d82b13d5f60d8e5cc638176dcd (diff) | |
download | scummvm-rg350-6c895643aa743bcb0f99841c580c9581648a2864.tar.gz scummvm-rg350-6c895643aa743bcb0f99841c580c9581648a2864.tar.bz2 scummvm-rg350-6c895643aa743bcb0f99841c580c9581648a2864.zip |
Merge pull request #667 from a-detiste/master
JANITORIAL: Typos detected with lintian & grep
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/graphics/animate.cpp | 2 | ||||
-rw-r--r-- | engines/sci/graphics/controls16.cpp | 2 | ||||
-rw-r--r-- | engines/sci/graphics/controls32.cpp | 2 | ||||
-rw-r--r-- | engines/sci/graphics/palette.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sci.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp index 7957ed6a55..fdd81a8caa 100644 --- a/engines/sci/graphics/animate.cpp +++ b/engines/sci/graphics/animate.cpp @@ -59,7 +59,7 @@ void GfxAnimate::init() { // fastCast object is not found in any SCI games prior SCI1 if (getSciVersion() <= SCI_VERSION_01) _ignoreFastCast = true; - // Also if fastCast object exists at gamestartup, we can assume that the interpreter doesnt do kAnimate aborts + // Also if fastCast object exists at gamestartup, we can assume that the interpreter doesn't do kAnimate aborts // (found in Larry 1) if (getSciVersion() > SCI_VERSION_0_EARLY) { if (!_s->_segMan->findObjectByName("fastCast").isNull()) diff --git a/engines/sci/graphics/controls16.cpp b/engines/sci/graphics/controls16.cpp index e2e250cf9d..b4bd92699a 100644 --- a/engines/sci/graphics/controls16.cpp +++ b/engines/sci/graphics/controls16.cpp @@ -151,7 +151,7 @@ void GfxControls16::kernelTexteditChange(reg_t controlObject, reg_t eventObject) Common::Rect rect; if (textReference.isNull()) - error("kEditControl called on object that doesnt have a text reference"); + error("kEditControl called on object that doesn't have a text reference"); text = _segMan->getString(textReference); uint16 oldCursorPos = cursorPos; diff --git a/engines/sci/graphics/controls32.cpp b/engines/sci/graphics/controls32.cpp index 1bd497ce98..04a70d35f3 100644 --- a/engines/sci/graphics/controls32.cpp +++ b/engines/sci/graphics/controls32.cpp @@ -54,7 +54,7 @@ void GfxControls32::kernelTexteditChange(reg_t controlObject) { Common::Rect rect; if (textReference.isNull()) - error("kEditControl called on object that doesnt have a text reference"); + error("kEditControl called on object that doesn't have a text reference"); text = _segMan->getString(textReference); // TODO: Finish this diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 106924ecd3..6f6e0b672e 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -310,7 +310,7 @@ void GfxPalette::set(Palette *newPalette, bool force, bool forceRealMerge) { uint32 systime = _sysPalette.timestamp; if (force || newPalette->timestamp != systime) { - // SCI1.1+ doesnt do real merging anymore, but simply copying over the used colors from other palettes + // SCI1.1+ doesn't do real merging anymore, but simply copying over the used colors from other palettes // There are some games with inbetween SCI1.1 interpreters, use real merging for them (e.g. laura bow 2 demo) if ((forceRealMerge) || (_useMerging)) _sysPaletteChanged |= merge(newPalette, force, forceRealMerge); diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 1232b6559b..93cafadc52 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -529,7 +529,7 @@ void SciEngine::patchGameSaveRestore() { byte kernelIdSave = 0; switch (_gameId) { - case GID_HOYLE1: // gets confused, although the game doesnt support saving/restoring at all + case GID_HOYLE1: // gets confused, although the game doesn't support saving/restoring at all case GID_HOYLE2: // gets confused, see hoyle1 case GID_JONES: // gets confused, when we patch us in, the game is only able to save to 1 slot, so hooking is not required case GID_MOTHERGOOSE: // mother goose EGA saves/restores directly and has no save/restore dialogs |