5 files changed, 19 insertions, 6 deletions

diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp
index b85eff686..d6d310616 100644
--- a/src/gui/widgets/passwordfield.cpp
+++ b/src/gui/widgets/passwordfield.cpp
@@ -29,7 +29,8 @@
 PasswordField::PasswordField(const Widget2 *const widget,
                              const std::string &text) :
     TextField(widget, text),
-    mPasswordChar(mSkin ? mSkin->getOption("passwordChar", 42) : 42)
+    mPasswordChar(mSkin ? static_cast<unsigned char>(
+                  mSkin->getOption("passwordChar", 42)) : 42U)
 {
 }
 
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index 4c05afd40..f9f677d0d 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -47,7 +47,7 @@ class PasswordField final : public TextField
         void draw(Graphics *graphics) override final;
 
     protected:
-        char mPasswordChar;
+        unsigned char mPasswordChar;
 };
 
 #endif  // GUI_WIDGETS_PASSWORDFIELD_H
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 02ff66354..ddd6ac873 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -166,13 +166,23 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
         maxHairStyle = mPlayer->getNumOfHairstyles();
 
     if (maxHairStyle)
-        mHairStyle = (rand() % maxHairStyle) + minHairStyle;
+    {
+        mHairStyle = (static_cast<unsigned int>(rand())
+            % maxHairStyle) + minHairStyle;
+    }
     else
+    {
         mHairStyle = 0;
+    }
     if (maxHairColor)
-        mHairColor = (rand() % maxHairColor) + minHairColor;
+    {
+        mHairColor = (static_cast<unsigned int>(rand())
+            % maxHairColor) + minHairColor;
+    }
     else
+    {
         mHairColor = 0;
+    }
 
     mNameField->setMaximum(24);
 
diff --git a/src/resources/dyepalette.cpp b/src/resources/dyepalette.cpp
index 4c62abd1c..753ff6823 100644
--- a/src/resources/dyepalette.cpp
+++ b/src/resources/dyepalette.cpp
@@ -99,7 +99,8 @@ unsigned int DyePalette::hexDecode(const signed char c)
         return 0;
 }
 
-void DyePalette::getColor(const int intensity, int color[3]) const
+void DyePalette::getColor(const unsigned int intensity,
+                          unsigned int color[3]) const
 {
     if (intensity == 0)
     {
diff --git a/src/resources/dyepalette.h b/src/resources/dyepalette.h
index a2f555b4f..39576002e 100644
--- a/src/resources/dyepalette.h
+++ b/src/resources/dyepalette.h
@@ -49,7 +49,8 @@ class DyePalette final
          * Gets a pixel color depending on its intensity. First color is
          * implicitly black (0, 0, 0).
          */
-        void getColor(const int intensity, int color[3]) const;
+        void getColor(const unsigned int intensity,
+                      unsigned int color[3]) const;
 
         /**
          * Gets a pixel color depending on its intensity.