diff options
| author | Matthew Hoops | 2011-05-25 10:32:45 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-25 10:50:46 -0400 |
| commit | 6b367531707a866e5997039d2a139ef16287a256 (patch) | |
| tree | 686325c6a8c0d7d21faa5eff140e66dcdefe97e4 | |
| parent | eea482fa4304cab0e23ca4abffdec3651e45f01d (diff) | |
| download | scummvm-rg350-6b367531707a866e5997039d2a139ef16287a256.tar.gz scummvm-rg350-6b367531707a866e5997039d2a139ef16287a256.tar.bz2 scummvm-rg350-6b367531707a866e5997039d2a139ef16287a256.zip | |
ALL: favour/favourite -> favor/favorite
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/dist/readme_ds.txt | 2 | ||||
| -rw-r--r-- | engines/lure/decode.cpp | 10 |
3 files changed, 7 insertions, 7 deletions
@@ -1123,7 +1123,7 @@ For a more comprehensive changelog of the latest experimental code, see: - Added MMX i386 assembler versions of the HQ2x and HQ3x scalers. - Added 'Extra Path' option allows for a searching an additional datafile location (for reencoded cutscenes and the like). - - Disabled Alt-x and Ctrl-z quit keys in favour of Ctrl-q on unix like + - Disabled Alt-x and Ctrl-z quit keys in favor of Ctrl-q on unix like operating systems, like Linux (exception: Mac OS X still uses Cmd-q). - Separate smaller font for the console, allowing for more visible information, for example in the SCUMM debugger. diff --git a/backends/platform/ds/arm9/dist/readme_ds.txt b/backends/platform/ds/arm9/dist/readme_ds.txt index ee1db719f4..24c85ad556 100644 --- a/backends/platform/ds/arm9/dist/readme_ds.txt +++ b/backends/platform/ds/arm9/dist/readme_ds.txt @@ -679,7 +679,7 @@ not supported. Cdex can do the conversion very well and I recommend using it to convert your audio files, although any CD ripping software can be used, so feel -free to use your favourite program. The format you need to use is +free to use your favorite program. The format you need to use is IMA-ADPCM 4-bit Mono. You may use any sample rate. All other formats will be rejected, including uncompressed WAV files. diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp index 3e139a10d6..59390e6e91 100644 --- a/engines/lure/decode.cpp +++ b/engines/lure/decode.cpp @@ -131,7 +131,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) { READ_BIT_DX if (!bitFlag) { - // Get the favourite color + // Get the favorite color v = popTable[tableOffset]; } else { @@ -143,7 +143,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) { READ_BIT_DX if (bitFlag) { - // We have no favourite. Could this be a repeat? + // We have no favorite. Could this be a repeat? al = dx >> 11; READ_BITS(5); @@ -184,7 +184,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) { } } else { - // Fourth favourite + // Fourth favorite v = popTable[tableOffset + 96]; } @@ -193,10 +193,10 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) { READ_BIT_DX if (bitFlag) { - // Third favourite + // Third favorite v = popTable[tableOffset + 64]; } else { - // Second favourite + // Second favorite v = popTable[tableOffset + 32]; } } |