diff options
Diffstat (limited to 'src/resources/dye')
-rw-r--r-- | src/resources/dye/dye.cpp | 4 | ||||
-rw-r--r-- | src/resources/dye/dye.h | 16 | ||||
-rw-r--r-- | src/resources/dye/dyepalette.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/resources/dye/dye.cpp b/src/resources/dye/dye.cpp index ff40545fc..a72bf8419 100644 --- a/src/resources/dye/dye.cpp +++ b/src/resources/dye/dye.cpp @@ -148,9 +148,9 @@ void Dye::instantiate(std::string &restrict target, int Dye::getType() const restrict2 noexcept2 { - if (mDyePalettes[sPaleteIndex] != nullptr) + if (mDyePalettes[sPaletteIndex] != nullptr) return 1; - if (mDyePalettes[aPaleteIndex] != nullptr) + if (mDyePalettes[aPaletteIndex] != nullptr) return 2; return 0; } diff --git a/src/resources/dye/dye.h b/src/resources/dye/dye.h index c359c9b24..442721c6a 100644 --- a/src/resources/dye/dye.h +++ b/src/resources/dye/dye.h @@ -31,8 +31,8 @@ class DyePalette; const int dyePalateSize = 9; -const int sPaleteIndex = 7; -const int aPaleteIndex = 8; +const int sPaletteIndex = 7; +const int aPaletteIndex = 8; /** * Class for dispatching pixel-recoloring amongst several palettes. @@ -62,16 +62,16 @@ class Dye final const std::string &restrict palettes); /** - * Return special dye palete (S) + * Return special dye palette (S) */ - const DyePalette *getSPalete() const restrict2 noexcept2 A_WARN_UNUSED - { return mDyePalettes[sPaleteIndex]; } + const DyePalette *getSPalette() const restrict2 noexcept2 A_WARN_UNUSED + { return mDyePalettes[sPaletteIndex]; } /** - * Return special dye palete (A) + * Return special dye palette (A) */ - const DyePalette *getAPalete() const restrict2 noexcept2 A_WARN_UNUSED - { return mDyePalettes[aPaleteIndex]; } + const DyePalette *getAPalette() const restrict2 noexcept2 A_WARN_UNUSED + { return mDyePalettes[aPaletteIndex]; } /** * Return dye type for S - 1, for A - 2, 0 for other diff --git a/src/resources/dye/dyepalette.h b/src/resources/dye/dyepalette.h index 7f57e3c5f..cffa985d1 100644 --- a/src/resources/dye/dyepalette.h +++ b/src/resources/dye/dyepalette.h @@ -51,7 +51,7 @@ class DyePalette final * The string is either a file name or a sequence of hexadecimal RGB * values separated by ',' and starting with '#'. */ - DyePalette(const std::string &restrict pallete, + DyePalette(const std::string &restrict description, const uint8_t blockSize); A_DELETE_COPY(DyePalette) |