gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

colour->color, behaviour->behavior

Browse Source 
These spellings are more common elsewhere in the codebase
This commit is contained in:
Rangi42
2023-11-27 16:02:17 -05:00
parent e1220d6fc6
commit b46aa0f55b
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@@ -168,4 +168,4 @@ RGBGFX generates palettes using algorithms found in the paper
(`GitHub <https://github.com/pagination-problem/pagination>`__, MIT license), (`GitHub <https://github.com/pagination-problem/pagination>`__, MIT license),
by Aristide Grange, Imed Kacem, and Sébastien Martin. by Aristide Grange, Imed Kacem, and Sébastien Martin.
RGBGFX's colour palette was taken from `SameBoy <https://sameboy.github.io>`__, with permission and help by `LIJI <https://github.com/LIJI32>`__. RGBGFX's color palette was taken from `SameBoy <https://sameboy.github.io>`__, with permission and help by `LIJI <https://github.com/LIJI32>`__.

2
src/gfx/reverse.cpp
View File

@@ -141,7 +141,7 @@ void reverse() {
std::vector<std::array<Rgba, 4>> palettes{ std::vector<std::array<Rgba, 4>> palettes{
{Rgba(0xFFFFFFFF), Rgba(0xAAAAAAFF), Rgba(0x555555FF), Rgba(0x000000FF)} {Rgba(0xFFFFFFFF), Rgba(0xAAAAAAFF), Rgba(0x555555FF), Rgba(0x000000FF)}
}; };
// If a palette file is used as input, it overrides the default colours. // If a palette file is used as input, it overrides the default colors.
if (options.palettes.has_value()) { if (options.palettes.has_value()) {
File file; File file;
if (!file.open(*options.palettes, std::ios::in | std::ios::binary)) { if (!file.open(*options.palettes, std::ios::in | std::ios::binary)) {

2
test/asm/test.sh
View File

@@ -12,7 +12,7 @@ output="$(mktemp)"
errput="$(mktemp)" errput="$(mktemp)"
rc=0 rc=0
# Immediate expansion is the desired behaviour. # Immediate expansion is the desired behavior.
# shellcheck disable=SC2064 # shellcheck disable=SC2064
trap "rm -f ${o@Q} ${gb@Q} ${input@Q} ${output@Q} ${errput@Q}" EXIT trap "rm -f ${o@Q} ${gb@Q} ${input@Q} ${output@Q} ${errput@Q}" EXIT

2
test/fix/test.sh
View File

@@ -8,7 +8,7 @@ rc=0
cp ../../{rgbfix,contrib/gbdiff.bash} "$tmpdir" cp ../../{rgbfix,contrib/gbdiff.bash} "$tmpdir"
cd "$tmpdir" || exit cd "$tmpdir" || exit
# Immediate expansion is the desired behaviour. # Immediate expansion is the desired behavior.
# shellcheck disable=SC2064 # shellcheck disable=SC2064
trap "cd; rm -rf ${tmpdir@Q}" EXIT trap "cd; rm -rf ${tmpdir@Q}" EXIT

2
test/link/test.sh
View File

@@ -9,7 +9,7 @@ gbtemp2="$(mktemp)"
outtemp="$(mktemp)" outtemp="$(mktemp)"
rc=0 rc=0
# Immediate expansion is the desired behaviour. # Immediate expansion is the desired behavior.
# shellcheck disable=SC2064 # shellcheck disable=SC2064
trap "rm -f ${otemp@Q} ${gbtemp@Q} ${gbtemp2@Q} ${outtemp@Q}" EXIT trap "rm -f ${otemp@Q} ${gbtemp@Q} ${gbtemp2@Q} ${outtemp@Q}" EXIT