[Performous-commit] Vincent Le Ligeour : Fixed performous pathes not using PERFORMOUS_DATA_DIR env

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: dance
Commit: 6854f19c8b9ba586b319773fbb0d187b8838cfa9

Author: Vincent Le Ligeour <yo...@us...>
Date:   Tue Nov 10 13:42:35 2009 +0100

Fixed performous pathes not using PERFORMOUS_DATA_DIR env

---

 game/backgrounds.cc   |    6 ------
 game/configuration.cc |   10 ++++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/game/backgrounds.cc b/game/backgrounds.cc
index 8450234..22a3e99 100644
--- a/game/backgrounds.cc
+++ b/game/backgrounds.cc
@@ -17,12 +17,6 @@ void Backgrounds::reload() {
 	if (m_loading) return;
 	// Copy backgrounddirs from config into m_bgdirs
 	ConfigItem::StringList sd = config["system/path_backgrounds"].sl();
-	char const* env_data_dir = getenv("PERFORMOUS_DATA_DIR");
-	if (env_data_dir) {
-		std::string background_dir(env_data_dir);
-		background_dir.append("/backgrounds/");
-		sd.push_back(background_dir);
-	}
 	m_bgs.clear();
 	std::transform(sd.begin(), sd.end(), std::inserter(m_bgdirs, m_bgdirs.end()), pathMangle);
 	// Run loading thread
diff --git a/game/configuration.cc b/game/configuration.cc
index 6c0d6be..b144c2b 100644
--- a/game/configuration.cc
+++ b/game/configuration.cc
@@ -333,5 +333,15 @@ void readConfig() {
 	readConfigXML(schemafile, 0);  // Read schema and defaults
 	readConfigXML(systemConfFile, 1);  // Update defaults with system config
 	readConfigXML(userConfFile, 2);  // Read user settings
+
+	// Adding some default pathes
+	char const* env_data_dir = getenv("PERFORMOUS_DATA_DIR");
+	if (env_data_dir) {
+		config["system/path_data"].sl().push_back(std::string(env_data_dir));
+		config["system/path_share"].sl().push_back(std::string(env_data_dir));
+		config["system/path_songs"].sl().push_back(std::string(env_data_dir) + "/songs/");
+		config["system/path_pictures"].sl().push_back(std::string(env_data_dir) + "/pictures/");
+		config["system/path_backgrounds"].sl().push_back(std::string(env_data_dir) + "/backgrounds/");
+	}
 }