JANITORIAL: Typos detected with lintian & grep

audio/mods/maxtrax.cpp

@@ -54,7 +54,7 @@ void nullFunc(int) {}
 
 // Function to calculate 2^x, where x is a fixedpoint number with 16 fraction bits
 // using exp would be more accurate and needs less space if mathlibrary is already linked
-// but this function should be faster and doesnt use floats
+// but this function should be faster and doesn't use floats
 #if 1
 inline uint32 pow2Fixed(int32 val) {
 	static const uint16 tablePow2[] = {

backends/platform/android/gfx.cpp

@@ -469,7 +469,7 @@ void OSystem_Android::updateScreen() {
 		GLCALL(glTranslatex(0, -_shake_offset << 16, 0));
 	}
 
-// TODO this doesnt work on those sucky drivers, do it differently
+// TODO this doesn't work on those sucky drivers, do it differently
 //	if (_show_overlay)
 //		GLCALL(glColor4ub(0x9f, 0x9f, 0x9f, 0x9f));
 

backends/platform/sdl/sdl-sys.h

@@ -112,7 +112,7 @@ typedef struct { int FAKE; } FAKE_FILE;
 #endif
 
 // In a moment of brilliance Xlib.h included by SDL_syswm.h #defines the
-// following names. In a moment of mental breakdown, which occured upon
+// following names. In a moment of mental breakdown, which occurred upon
 // gazing at Xlib.h, LordHoto decided to undefine them to prevent havoc.
 #ifdef Status
 #undef Status

common/taskbar.h

@@ -123,7 +123,7 @@ public:
 	virtual void addRecent(const String &name, const String &description) {}
 
 	/**
-	 * Notifies the user an error occured through the taskbar icon
+	 * Notifies the user an error occurred through the taskbar icon
 	 *
 	 * This will for example show the taskbar icon as red (using progress of 100% and an error state)
 	 * on Windows, and set the launcher icon in the urgent state on Unity

devtools/create_project/scripts/postbuild.cmd

@@ -59,7 +59,7 @@ echo Invalid installer parameter. Should be "0" or "1" (was %~5)!
 goto done
 
 :error_script:
-echo An error occured while running the installer script!
+echo An error occurred while running the installer script!
 goto done
 
 :done

devtools/create_project/scripts/prebuild.cmd

@@ -27,7 +27,7 @@ echo Invalid target folder (%~2)!
 goto done
 
 :error_script:
-echo An error occured while running the revision script!
+echo An error occurred while running the revision script!
 
 :done
 exit /B0

engines/agos/sound.cpp

@@ -217,7 +217,7 @@ static void convertVolume(int &vol) {
 }
 
 static void convertPan(int &pan) {
-	// DirectSound was orginally used, which specifies volume
+	// DirectSound was originally used, which specifies volume
 	// and panning differently than ScummVM does, using a logarithmic scale
 	// rather than a linear one.
 	//

engines/groovie/groovie.cpp

@@ -69,7 +69,7 @@ GroovieEngine::GroovieEngine(OSystem *syst, const GroovieGameDescription *gd) :
 
 	// Initialize the custom debug levels
 	DebugMan.addDebugChannel(kDebugVideo, "Video", "Debug video and audio playback");
-	DebugMan.addDebugChannel(kDebugResource, "Resource", "Debug resouce management");
+	DebugMan.addDebugChannel(kDebugResource, "Resource", "Debug resource management");
 	DebugMan.addDebugChannel(kDebugScript, "Script", "Debug the scripts");
 	DebugMan.addDebugChannel(kDebugUnknown, "Unknown", "Report values of unknown data in files");
 	DebugMan.addDebugChannel(kDebugHotspots, "Hotspots", "Show the hotspots");

engines/kyra/debugger.cpp

@@ -542,7 +542,7 @@ bool Debugger_EoB::cmdSaveOriginal(int argc, const char **argv) {
 				debugPrintf("Failure.\n");
 			}
 		} else {
-			debugPrintf("Syntax:   save_original\n          (Saves game in original file format to a file which can be used with the orginal game executable.)\n\n");
+			debugPrintf("Syntax:   save_original\n          (Saves game in original file format to a file which can be used with the original game executable.)\n\n");
 		}
 		return true;
 
@@ -562,7 +562,7 @@ bool Debugger_EoB::cmdSaveOriginal(int argc, const char **argv) {
 		return true;
 	}
 
-	debugPrintf("Syntax:   save_original <slot>\n          (Saves game in original file format to a file which can be used with the orginal game executable.\n          A save slot between 0 and 5 must be specified.)\n\n");
+	debugPrintf("Syntax:   save_original <slot>\n          (Saves game in original file format to a file which can be used with the original game executable.\n          A save slot between 0 and 5 must be specified.)\n\n");
 	return true;
 }
 

engines/kyra/gui_lol.cpp

@@ -2219,7 +2219,7 @@ int GUI_LoL::runMenu(Menu &menu) {
 	int fW = (d->w << 3) - wW;
 	int fC = 0;
 
-	// LoL doesnt't have default higlighted items. No item should be
+	// LoL doesn't have default higlighted items. No item should be
 	// highlighted when entering a new menu.
 	// Instead, the respevtive struct entry is used to determine whether
 	// a menu has scroll buttons or slider bars.

engines/kyra/gui_v1.cpp

@@ -200,7 +200,7 @@ void GUI_v1::processHighlights(Menu &menu) {
 	int mouseY = p.y;
 
 	if (_vm->game() == GI_LOL && menu.highlightedItem != 255) {
-		// LoL doesnt't have default highlighted items.
+		// LoL doesn't have default highlighted items.
 		// We use a highlightedItem value of 255 for this.
 
 		// With LoL no highlighting should take place unless the

engines/mads/msurface.h

@@ -56,7 +56,7 @@ protected:
 	bool _freeFlag;
 public:
 	/**
-	 * Sets the engine refrence used all surfaces
+	 * Sets the engine reference used all surfaces
 	 */
 	static void setVm(MADSEngine *vm) { _vm = vm; }
 

engines/prince/graphics.cpp

@@ -279,7 +279,7 @@ void GraphicsMan::drawTransparentWithTransDrawNode(Graphics::Surface *screen, Dr
 							// first and last row at the same time (height = 1) - no anti-alias
 							continue;
 						}
-						// new color value based on orginal screen surface color and sprite's edge pixel color
+						// new color value based on original screen surface color and sprite's edge pixel color
 						*dst2 = transTableData[*dst2 * 256 + value];
 					}
 				}

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())

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;

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

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);

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

engines/scumm/actor.cpp

@@ -861,7 +861,7 @@ L2C36:;
 			stopActorMoving();
 			return;
 		}
-		// 2C98: Yes, an exact copy of what just occured.. the original does this, so im doing it...
+		// 2C98: Yes, an exact copy of what just occurred.. the original does this, so im doing it...
 		//       Just to keep me sane when going over it :)
 		if (A == 0xFF) {
 			setActorFromTmp();

engines/scumm/imuse_digi/dimuse_track.cpp

@@ -352,9 +352,9 @@ Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDelay) {
 	// leaving bug number for now #1635361
 	ImuseDigiSndMgr::SoundDesc *soundDesc = _sound->cloneSound(track->soundDesc);
 	if (!soundDesc) {
-		// it fail load open old song after switch to diffrent CDs
+		// it fail load open old song after switch to different CDs
 		// so gave up
-		error("Game not supported while playing on 2 diffrent CDs");
+		error("Game not supported while playing on 2 different CDs");
 	}
 	track->soundDesc = soundDesc;
 

engines/scumm/players/player_v4a.cpp

@@ -174,7 +174,7 @@ int Player_V4A::getMusicTimer() {
 		return 2000;
 	if (_musicId) {
 		// The titlesong (and a few others) is running with ~70 ticks per second and the scale seems to be based on that.
-		// The Game itself doesnt get the timing from the Tfmx Player however, so we just use the elapsed time
+		// The Game itself doesn't get the timing from the Tfmx Player however, so we just use the elapsed time
 		// 357 ~ 1000 * 25 * (1 / 70)
 		return _mixer->getSoundElapsedTime(_musicHandle) / 357;
 	}
@@ -183,7 +183,7 @@ int Player_V4A::getMusicTimer() {
 
 int Player_V4A::getSoundStatus(int nr) const {
 	// For music the game queues a variable the Tfmx Player sets through a special command.
-	// For sfx there seems to be no way to queue them, and the game doesnt try to.
+	// For sfx there seems to be no way to queue them, and the game doesn't try to.
 	return (nr == _musicId) ? _signal : 0;
 }
 

engines/scumm/scumm_v4.h

@@ -35,7 +35,7 @@ class ScummEngine_v4 : public ScummEngine_v5 {
 public:
 
 	/**
-	 * Prepared savegame used by the orginal save/load dialog.
+	 * Prepared savegame used by the original save/load dialog.
 	 * Must be valid as long as the savescreen is active. As we are not
 	 * notified when the savescreen is closed, memory is only freed on a game
 	 * reset, at the destruction of the engine or when the original save/load

engines/scumm/sound.cpp

@@ -240,7 +240,7 @@ void Sound::playSound(int soundID) {
 		// mentioned in the bug report above; in case it is, I put a check here.
 		assert(soundID == 39);
 
-		// The samplerate is copied from the sound resouce 39 of the PC CD/VGA
+		// The samplerate is copied from the sound resource 39 of the PC CD/VGA
 		// version of Monkey Island.
 
 		// Read info from the header

engines/sword1/objectman.cpp

@@ -119,7 +119,7 @@ char *ObjectMan::lockText(uint32 textId, uint8 lang) {
 		return NULL;
 	addr += sizeof(Header);
 	if ((textId & ITM_ID) >= _resMan->readUint32(addr)) {
-		// Workaround for missing sentences in some langages in the demo.
+		// Workaround for missing sentences in some languages in the demo.
 		switch(textId) {
 		case 8455194:
 			return const_cast<char *>(_translationId8455194[lang]);
@@ -160,7 +160,7 @@ char *ObjectMan::lockText(uint32 textId, uint8 lang) {
 	}
 	uint32 offset = _resMan->readUint32(addr + ((textId & ITM_ID) + 1) * 4);
 	if (offset == 0) {
-		// Workaround bug for missing sentence in some langages in Syria (see bug #1977094).
+		// Workaround bug for missing sentence in some languages in Syria (see bug #1977094).
 		// We use the hardcoded text in this case.
 		if (textId == 2950145)
 			return const_cast<char *>(_translationId2950145[lang]);
@@ -223,7 +223,7 @@ void ObjectMan::saveLiveList(uint16 *dest) {
 }
 
 // String displayed when a subtitle sentence is missing in the cluster file.
-// It happens with at least one sentence in Syria in some langages (see bug
+// It happens with at least one sentence in Syria in some languages (see bug
 // #1977094).
 // Note: an empty string or a null pointer causes a crash.
 

engines/sword1/objectman.h

@@ -62,7 +62,7 @@ private:
 	uint16  _liveList[TOTAL_SECTIONS];                  //which sections are active
 	uint8 *_cptData[TOTAL_SECTIONS];
 	static char _missingSubTitleStr[];
-	static const char *const _translationId2950145[7];        //translation for textId 2950145 (missing from cluster file for some langages)
+	static const char *const _translationId2950145[7];        //translation for textId 2950145 (missing from cluster file for some languages)
 	static const char *const _translationId8455194[7];        //translation for textId 8455194 (missing in the demo)
 	static const char *const _translationId8455195[7];        //translation for textId 8455195 (missing in the demo)
 	static const char *const _translationId8455196[7];        //translation for textId 8455196 (missing in the demo)

engines/sword1/router.cpp

@@ -1455,7 +1455,7 @@ int32 Router::newCheck(int32 status, int32 x1, int32 y1, int32 x2, int32 y2) {
 	 * newCheck differs from check in that that 4 route options are
 	 * considered corresponding to actual walked routes.
 	 *
-	 * Note distance doesnt take account of shrinking ???
+	 * Note distance doesn't take account of shrinking ???
 	 *
 	 * Note Bars array must be properly calculated ie min max dx dy co
 	 *********************************************************************/

engines/sword2/router.cpp

@@ -1712,7 +1712,7 @@ int32 Router::newCheck(int32 status, int32 x1, int32 y1, int32 x2, int32 y2) {
 	 * newCheck differs from check in that that 4 route options are
 	 * considered corresponding to actual walked routes.
 	 *
-	 * Note distance doesnt take account of shrinking ???
+	 * Note distance doesn't take account of shrinking ???
 	 *
 	 * Note Bars array must be properly calculated ie min max dx dy co
 	 *********************************************************************/

engines/sword25/fmv/movieplayer.h

@@ -67,7 +67,7 @@ public:
 	 * movie file, it will be unloaded and, if necessary, stopped playing.
 	 * @param Filename      The filename of the movie file to be loaded
 	 * @param Z             Z indicates the position of the film on the main graphics layer
-	 * @return              Returns false if an error occured while loading, otherwise true.
+	 * @return              Returns false if an error occurred while loading, otherwise true.
 	*/
 	bool loadMovie(const Common::String &filename, uint z);
 

engines/sword25/script/luacallback.cpp

@@ -119,7 +119,7 @@ void LuaCallback::invokeCallbackFunctions(lua_State *L, uint objectHandle) {
 			// Lua_pcall the function and the parameters pop themselves from the stack
 			if (lua_pcall(L, argumentCount, 0, 0) != 0) {
 				// An error has occurred
-				error("An error occured executing a callback function: %s", lua_tostring(L, -1));
+				error("An error occurred executing a callback function: %s", lua_tostring(L, -1));
 
 				// Pop error message from the stack
 				lua_pop(L, 1);

engines/sword25/script/luascript.cpp

@@ -214,7 +214,7 @@ bool LuaScriptEngine::executeBuffer(const byte *data, uint size, const Common::S
 
 	// Run buffer contents
 	if (lua_pcall(_state, 0, 0, -2) != 0) {
-		error("An error occured while executing \"%s\":\n%s.",
+		error("An error occurred while executing \"%s\":\n%s.",
 		               name.c_str(),
 		               lua_tostring(_state, -1));
 		lua_pop(_state, 2);

engines/sword25/sword25.cpp

@@ -120,7 +120,7 @@ Common::Error Sword25Engine::appStart() {
 	// Pass the command line to the script engine.
 	ScriptEngine *scriptPtr = Kernel::getInstance()->getScript();
 	if (!scriptPtr) {
-		error("Script intialization failed.");
+		error("Script initialization failed.");
 		return Common::kUnknownError;
 	}
 

engines/sword25/util/lua/lbaselib.cpp

@@ -492,7 +492,7 @@ static int costatus (lua_State *L, lua_State *co) {
       else
         return CO_SUS;  /* initial state */
     }
-    default:  /* some error occured */
+    default:  /* some error occurred */
       return CO_DEAD;
   }
 }

engines/sword25/util/lua/ldo.cpp

@@ -114,7 +114,7 @@ void luaD_throw (lua_State *L, int errcode) {
     // LUAI_THROW has been replaced with an error message in ScummVM, together
     // with the LUA error code and description
     //LUAI_THROW(L, L->errorJmp);
-    error("LUA error occured, error code is %d (%s)", errcode, luaErrorDescription[errcode]);
+    error("LUA error occurred, error code is %d (%s)", errcode, luaErrorDescription[errcode]);
   }
   else {
     L->status = cast_byte(errcode);

engines/wintermute/ad/ad_actor.cpp

@@ -958,13 +958,13 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		stack->correctParams(1);
 		ScValue *val = stack->pop();
 		if (!val->isNative()) {
-			script->runtimeError("actor.%s method accepts an entity refrence only", name);
+			script->runtimeError("actor.%s method accepts an entity reference only", name);
 			stack->pushNULL();
 			return STATUS_OK;
 		}
 		AdObject *obj = (AdObject *)val->getNative();
 		if (!obj || obj->getType() != OBJECT_ENTITY) {
-			script->runtimeError("actor.%s method accepts an entity refrence only", name);
+			script->runtimeError("actor.%s method accepts an entity reference only", name);
 			stack->pushNULL();
 			return STATUS_OK;
 		}

graphics/thumbnail.cpp

@@ -67,7 +67,7 @@ HeaderState loadHeader(Common::SeekableReadStream &in, ThumbnailHeader &header,
 	header.size = in.readUint32BE();
 	header.version = in.readByte();
 
-	// Do a check whether any read errors had occured. If so we cannot use the
+	// Do a check whether any read errors had occurred. If so we cannot use the
 	// values obtained for size and version because they might be bad.
 	if (in.err() || in.eos()) {
 		// TODO: We fake that there is no header. This is actually not quite