diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-01-14 15:59:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-01-14 15:59:03 +0300 |
| commit | ca12866fa8e6f95d9efadab26952a58540eec939 (patch) | |
| tree | 993f9a56750917b6167b1c1f45eb701b9e7b92c0 | |
| parent | 9a0e17c9934233995badbe6c4b3c3a3f7c0d16b8 (diff) | |
| download | manaplus-ca12866fa8e6f95d9efadab26952a58540eec939.tar.gz manaplus-ca12866fa8e6f95d9efadab26952a58540eec939.tar.bz2 manaplus-ca12866fa8e6f95d9efadab26952a58540eec939.tar.xz manaplus-ca12866fa8e6f95d9efadab26952a58540eec939.zip | |
Add palettesDir option in paths.xml for set directory for GIMP palettes.
| -rw-r--r-- | src/defaults.cpp | 1 | ||||
| -rw-r--r-- | src/resources/db/palettedb.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 47253b5dd..82540150b 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -625,6 +625,7 @@ DefaultsData* getPathsDefaults() AddDEF("inactivebadge", "inactive.xml"); AddDEF("awaybadge", "away.xml"); + AddDEF("palettesDir", ""); AddDEF("defaultPaletteFile", "palette.gpl"); return configData; diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index 3c7abe6af..3ad2b13fa 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -49,8 +49,8 @@ void PaletteDB::loadPalette() { mLoaded = true; StringVect lines; - Files::loadTextFile(paths.getStringValue( - "defaultPaletteFile"), + Files::loadTextFile(paths.getStringValue("palettesDir") + + paths.getStringValue("defaultPaletteFile"), lines); StringVectCIter it = lines.begin(); if (it == lines.end()) |