diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/attributes.cpp | 6 | ||||
| -rw-r--r-- | src/resources/spritedef.h | 6 | ||||
| -rw-r--r-- | src/resources/theme.cpp | 2 | ||||
| -rw-r--r-- | src/resources/theme.h | 6 |
4 files changed, 7 insertions, 13 deletions
diff --git a/src/resources/attributes.cpp b/src/resources/attributes.cpp index 82871b2f..a9a3bd11 100644 --- a/src/resources/attributes.cpp +++ b/src/resources/attributes.cpp @@ -162,7 +162,6 @@ namespace Attributes { Attribute a; a.id = 16; a.name = _("Strength"); - a.description = ""; a.modifiable = true; a.scope = "character"; a.playerInfoId = -1; @@ -175,7 +174,6 @@ namespace Attributes { Attribute a; a.id = 17; a.name = _("Agility"); - a.description = ""; a.modifiable = true; a.scope = "character"; a.playerInfoId = -1; @@ -188,7 +186,6 @@ namespace Attributes { Attribute a; a.id = 18; a.name = _("Dexterity"); - a.description = ""; a.modifiable = true; a.scope = "character"; a.playerInfoId = -1; @@ -201,7 +198,6 @@ namespace Attributes { Attribute a; a.id = 19; a.name = _("Vitality"); - a.description = ""; a.modifiable = true; a.scope = "character"; a.playerInfoId = -1; @@ -214,7 +210,6 @@ namespace Attributes { Attribute a; a.id = 20; a.name = _("Intelligence"); - a.description = ""; a.modifiable = true; a.scope = "character"; a.playerInfoId = -1; @@ -227,7 +222,6 @@ namespace Attributes { Attribute a; a.id = 21; a.name = _("Willpower"); - a.description = ""; a.modifiable = true; a.scope = "character"; a.playerInfoId = -1; diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index b044e7b6..dff3f2a0 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -35,7 +35,7 @@ class ImageSet; struct SpriteReference { - SpriteReference() {} + SpriteReference() = default; SpriteReference(std::string sprite, int variant): sprite(sprite), @@ -77,7 +77,7 @@ namespace SpriteAction static const std::string USE_SPECIAL = "special"; static const std::string CAST_MAGIC = "magic"; static const std::string USE_ITEM = "item"; - static const std::string INVALID = ""; + static const std::string INVALID; } enum SpriteDirection @@ -121,7 +121,7 @@ class SpriteDef : public Resource * Loads a sprite element. */ void loadSprite(xmlNodePtr spriteNode, int variant, - const std::string &palettes = ""); + const std::string &palettes = std::string()); /** * Loads an imageset element. diff --git a/src/resources/theme.cpp b/src/resources/theme.cpp index 8c758280..4686edf1 100644 --- a/src/resources/theme.cpp +++ b/src/resources/theme.cpp @@ -532,7 +532,7 @@ void Theme::loadColors(std::string file) if (file == defaultThemePath) return; // No need to reload - if (file == "") + if (file.empty()) file = defaultThemePath; file += "/colors.xml"; diff --git a/src/resources/theme.h b/src/resources/theme.h index 9e7c4c3e..ae795ed4 100644 --- a/src/resources/theme.h +++ b/src/resources/theme.h @@ -42,7 +42,7 @@ class Skin public: Skin(ImageRect skin, Image *close, Image *stickyUp, Image *stickyDown, const std::string &filePath, - const std::string &name = ""); + const std::string &name = std::string()); ~Skin(); @@ -209,7 +209,7 @@ class Theme : public Palette, public EventListener /** * Get the minimum opacity allowed to skins. */ - float getMinimumOpacity() + float getMinimumOpacity() const { return mMinimumOpacity; } /** @@ -237,7 +237,7 @@ class Theme : public Palette, public EventListener static bool tryThemePath(std::string themePath); - void loadColors(std::string file = ""); + void loadColors(std::string file = std::string()); /** * Tells if the current skins opacity |