diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaults.cpp | 2 | ||||
| -rw-r--r-- | src/resources/dye.cpp | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 443795a8..7d99966d 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -128,7 +128,7 @@ DefaultsData* getBrandingDefaults() DefaultsData* brandingData = new DefaultsData; // Init config defaults AddDEF(brandingData, "wallpapersPath", ""); - AddDEF(brandingData, "wallpapersFile", ""); + AddDEF(brandingData, "wallpaperFile", ""); AddDEF(brandingData, "appName", "Mana"); AddDEF(brandingData, "appIcon", "icons/mana"); AddDEF(brandingData, "loginMusic", "Magick - Real.ogg"); diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index e7c9be56..abd6a411 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -50,13 +50,23 @@ DyePalette::DyePalette(const std::string &description) int n; if ('0' <= c && c <= '9') + { n = c - '0'; + } else if ('A' <= c && c <= 'F') + { n = c - 'A' + 10; + } else if ('a' <= c && c <= 'f') + { n = c - 'a' + 10; + } else - goto error; + { + logger->log("Error, invalid embedded palette: %s", + description.c_str()); + return; + } v = (v << 4) | n; } @@ -72,7 +82,6 @@ DyePalette::DyePalette(const std::string &description) ++pos; } - error: logger->log("Error, invalid embedded palette: %s", description.c_str()); } |