Ticket #9232: typos.patch

base/main.cpp

@@ -310 +310 @@
         Common::StringMap settings;
         command = Base::parseCommandLine(settings, argc, argv);
 
-        // Load the config file (possibly overriden via command line):
+        // Load the config file (possibly overridden via command line):
         if (settings.contains("config")) {
                 ConfMan.loadConfigFile(settings["config"]);
                 settings.erase("config");

common/unzip.cpp

@@ -401 +401 @@
 /* ===========================================================================
      Read a byte from a gz_stream; update next_in and avail_in. Return EOF
    for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
+   IN assertion: the stream s has been successfully opened for reading.
 */
 
 

engines/advancedDetector.cpp

@@ -622 +622 @@
                                 matchedDesc = agdesc;
                                 maxNumMatchedFiles = numMatchedFiles;
 
-                                debug(4, "and overriden");
+                                debug(4, "and overridden");
                         }
                 }
         }

engines/cruise/dataLoader.cpp

@@ -55 +55 @@
                 break;
 
         default:
-                error("Unkown gfx format %d", format);
+                error("Unknown gfx format %d", format);
         }
 
         uint8 *buffer = (uint8 *)MemAlloc(spriteSize);

engines/lure/debugger.cpp

@@ -323 +323 @@
 
                 if (h != NULL) {
                         DebugPrintf("Frame Number = %d of %d\n", h->frameNumber(), h->numFrames());
-                        DebugPrintf("Persistant = %s\n", h->persistant() ? "true" : "false");
+                        DebugPrintf("Persistent = %s\n", h->persistant() ? "true" : "false");
                 }
 
         } else if (strcmp(argv[2], "actions") == 0) {

engines/saga/introproc_ite.cpp

@@ -485 +485 @@
                 break;
 
         default:
-                warning("Illegal scene procedure paramater");
+                warning("Illegal scene procedure parameter");
                 break;
         }
 
@@ -589 +589 @@
         case SCENE_END:
                 break;
         default:
-                warning("Illegal scene procedure paramater");
+                warning("Illegal scene procedure parameter");
                 break;
         }
 
@@ -694 +694 @@
         case SCENE_END:
                 break;
         default:
-                warning("Illegal scene procedure paramater");
+                warning("Illegal scene procedure parameter");
                 break;
         }
 
@@ -812 +812 @@
         case SCENE_END:
                 break;
         default:
-                warning("Illegal scene procedure paramater");
+                warning("Illegal scene procedure parameter");
                 break;
         }
 

engines/scumm/debugger.cpp

@@ -529 +529 @@
         } else {
                 DebugPrintf("Usage: debug [+CHANNEL|-CHANNEL]\n");
                 DebugPrintf("Enables or disables the given debug channel.\n");
-                DebugPrintf("When used without parameters, lists all avaiable debug channels and their status.\n");
+                DebugPrintf("When used without parameters, lists all available debug channels and their status.\n");
         }
 
         return true;

engines/scumm/insane/insane_ben.cpp

@@ -1163 +1163 @@
                         setBenState();
                         _actor[0].act[2].tilt = 0;
                         // for some reason there is no break at this
-                        // place, so tilt gets overriden on next line
+                        // place, so tilt gets overridden on next line
                 }
                 _actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
                 break;

engines/scumm/insane/insane_enemy.cpp

@@ -2072 +2072 @@
                         setEnemyState();
                         _actor[1].act[2].tilt = 0;
                         // for some reason there is no break at this
-                        // place, so tilt gets overriden on next line
+                        // place, so tilt gets overridden on next line
                 }
                 _actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
                 break;

engines/scumm/player_v2cms.cpp

@@ -422 +422 @@
                         break;
 
                 default:        /* Error! */
-                        error("CMS Unkown write to reg %x with %x",reg, data);
+                        error("CMS Unknown write to reg %x with %x",reg, data);
         }
 }
 

graphics/video/flic_decoder.cpp

@@ -70 +70 @@
         }
 
         _fileStream->readUint16LE();    // flags
-        // Note: The normal delay is a 32-bit integer (dword), whereas the overriden delay is a 16-bit integer (word)
+        // Note: The normal delay is a 32-bit integer (dword), whereas the overridden delay is a 16-bit integer (word)
         // the frame delay is the FLIC "speed", in milliseconds.
         _frameRate = Common::Rational(1000, _fileStream->readUint32LE());
 
@@ -207 +207 @@
                         // this properly.
 
                         chunkCount = _fileStream->readUint16LE();
-                        // Note: The overriden delay is a 16-bit integer (word), whereas the normal delay is a 32-bit integer (dword)
+                        // Note: The overridden delay is a 16-bit integer (word), whereas the normal delay is a 32-bit integer (dword)
                         // the frame delay is the FLIC "speed", in milliseconds.
                         uint16 newFrameDelay = _fileStream->readUint16LE();     // "speed", in milliseconds
                         if (newFrameDelay > 0)

sound/decoders/flac.cpp

@@ -303 +303 @@
         const uint numChannels = getChannels();
 
         if (numChannels == 0) {
-                warning("FLACStream: Stream not sucessfully initialised, cant playback");
+                warning("FLACStream: Stream not successfully initialised, cant playback");
                 return -1; // streaminfo wasnt read!
         }
 

sound/mods/tfmx.cpp

@@ -281 +281 @@
                         continue;
 
                 case 0x04:      // Wait. Parameters: Ticks to wait(W).
-                        // TODO: some unkown Parameter? (macroPtr[1] & 1)
+                        // TODO: some unknown Parameter? (macroPtr[1] & 1)
                         channel.macroWait = READ_BE_UINT16(&macroPtr[2]);
                         break;
 
@@ -1154 +1154 @@
         if (macroData[0] < ARRAYSIZE(tableMacros))
                 debug("%s %02X%02X%02X", tableMacros[macroData[0]], macroData[1], macroData[2], macroData[3]);
         else
-                debug("Unkown Macro #%02X %02X%02X%02X", macroData[0], macroData[1], macroData[2], macroData[3]);
+                debug("Unknown Macro #%02X %02X%02X%02X", macroData[0], macroData[1], macroData[2], macroData[3]);
 }
 
 void displayPatternstep(const void * const vptr) {