thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: favour/favourite -> favor/favorite

Browse source
This commit is contained in:
Matthew Hoops 2011-05-25 10:32:45 -04:00
parent eea482fa43
commit 6b36753170
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -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 MMX i386 assembler versions of the HQ2x and HQ3x scalers.
- Added 'Extra Path' option allows for a searching an additional datafile - Added 'Extra Path' option allows for a searching an additional datafile
location (for reencoded cutscenes and the like). 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). operating systems, like Linux (exception: Mac OS X still uses Cmd-q).
- Separate smaller font for the console, allowing for more visible - Separate smaller font for the console, allowing for more visible
information, for example in the SCUMM debugger. information, for example in the SCUMM debugger.

2
backends/platform/ds/arm9/dist/readme_ds.txt vendored
View file

@ -679,7 +679,7 @@ not supported.
Cdex can do the conversion very well and I recommend using it to convert 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 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 IMA-ADPCM 4-bit Mono. You may use any sample rate. All other formats
will be rejected, including uncompressed WAV files. will be rejected, including uncompressed WAV files.

10
engines/lure/decode.cpp
View file

@ -131,7 +131,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
READ_BIT_DX READ_BIT_DX
if (!bitFlag) { if (!bitFlag) {
// Get the favourite color // Get the favorite color
v = popTable[tableOffset]; v = popTable[tableOffset];
} else { } else {
@ -143,7 +143,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
READ_BIT_DX READ_BIT_DX
if (bitFlag) { if (bitFlag) {
// We have no favourite. Could this be a repeat? // We have no favorite. Could this be a repeat?
al = dx >> 11; al = dx >> 11;
READ_BITS(5); READ_BITS(5);
@ -184,7 +184,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
} }
} else { } else {
// Fourth favourite // Fourth favorite
v = popTable[tableOffset + 96]; v = popTable[tableOffset + 96];
} }
@ -193,10 +193,10 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
READ_BIT_DX READ_BIT_DX
if (bitFlag) { if (bitFlag) {
// Third favourite // Third favorite
v = popTable[tableOffset + 64]; v = popTable[tableOffset + 64];
} else { } else {
// Second favourite // Second favorite
v = popTable[tableOffset + 32]; v = popTable[tableOffset + 32];
} }
} }