From 5040c10614b52d5120cd16f483bd6e32baabecd7 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Fri, 30 Sep 2011 15:29:32 +0200 Subject: Fixed a typo in a default value. --- src/defaults.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- cgit v1.2.3-70-g09d2 From b9ef24610683211dbd847d93f7d29de88bf0f170 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Jan 2011 00:19:09 +0200 Subject: Remove goto from dye.cpp --- src/resources/dye.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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()); } -- cgit v1.2.3-70-g09d2