summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp2
-rw-r--r--src/resources/dye/dye.cpp4
-rw-r--r--src/resources/dye/dye.h16
-rw-r--r--src/resources/dye/dyepalette.h2
-rw-r--r--src/resources/imagehelper.cpp4
-rw-r--r--src/resources/openglimagehelper.cpp4
-rw-r--r--src/resources/safeopenglimagehelper.cpp4
-rw-r--r--src/resources/sdlimagehelper.cpp4
8 files changed, 20 insertions, 20 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 1370b7950..1280f8b79 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -349,7 +349,7 @@ void ItemDB::loadXmlFile(const std::string &fileName,
if (iconColors.empty())
iconColors = colors;
- // check for empty hair palete
+ // check for empty hair palette
if (id <= -1 && id > -100)
{
if (colors.empty())
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)
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index 5109d1b93..71f3cc5a9 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -106,14 +106,14 @@ Image *ImageHelper::load(SDL_RWops *const rw, Dye const &dye)
{
case 1:
{
- const DyePalette *const pal = dye.getSPalete();
+ const DyePalette *const pal = dye.getSPalette();
if (pal != nullptr)
DYEPALETTEP(pal, SColor)(pixels, surf->w * surf->h);
break;
}
case 2:
{
- const DyePalette *const pal = dye.getAPalete();
+ const DyePalette *const pal = dye.getAPalette();
if (pal != nullptr)
DYEPALETTEP(pal, AColor)(pixels, surf->w * surf->h);
break;
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 3168a75c6..2221ffb05 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -87,14 +87,14 @@ Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye)
{
case 1:
{
- const DyePalette *const pal = dye.getSPalete();
+ const DyePalette *const pal = dye.getSPalette();
if (pal != nullptr)
DYEPALETTEP(pal, SOGLColor)(pixels, surf->w * surf->h);
break;
}
case 2:
{
- const DyePalette *const pal = dye.getAPalete();
+ const DyePalette *const pal = dye.getAPalette();
if (pal != nullptr)
DYEPALETTEP(pal, AOGLColor)(pixels, surf->w * surf->h);
break;
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index d50f44fd0..962d1434a 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -84,14 +84,14 @@ Image *SafeOpenGLImageHelper::load(SDL_RWops *const rw,
{
case 1:
{
- const DyePalette *const pal = dye.getSPalete();
+ const DyePalette *const pal = dye.getSPalette();
if (pal != nullptr)
DYEPALETTEP(pal, SOGLColor)(pixels, surf->w * surf->h);
break;
}
case 2:
{
- const DyePalette *const pal = dye.getAPalete();
+ const DyePalette *const pal = dye.getAPalette();
if (pal != nullptr)
DYEPALETTEP(pal, AOGLColor)(pixels, surf->w * surf->h);
break;
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index ab780cd33..d9a5e27dd 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -109,14 +109,14 @@ Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye)
{
case 1:
{
- const DyePalette *const pal = dye.getSPalete();
+ const DyePalette *const pal = dye.getSPalette();
if (pal != nullptr)
DYEPALETTEP(pal, SColor)(pixels, surf->w * surf->h);
break;
}
case 2:
{
- const DyePalette *const pal = dye.getAPalete();
+ const DyePalette *const pal = dye.getAPalette();
if (pal != nullptr)
DYEPALETTEP(pal, AColor)(pixels, surf->w * surf->h);
break;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-15 21:11:00 +0000