From e4829981b1d3e746a8f2b6c6cc41b8ba965c5e0e Mon Sep 17 00:00:00 2001
From: Jakob Fries <jakob.fries@gmail.com>
Date: Sun, 5 Aug 2007 15:56:32 +0000
Subject:

---
 src/editor/editor.cpp        |  1 +
 src/engine/client/client.cpp |  1 +
 src/engine/config.cpp        | 26 ++++++++++++++++++++++++++
 src/engine/server/server.cpp |  1 +
 src/game/client/menu.cpp     |  2 ++
 5 files changed, 31 insertions(+)

(limited to 'src')

diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
index 1ca1c197..ae7bfcd2 100644
--- a/src/editor/editor.cpp
+++ b/src/editor/editor.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <baselib/system.h>
 #include <baselib/input.h>
+#include <baselib/config.h>
 //#include <baselib/mouse.h>
 
 #include <engine/interface.h>
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 2eb8ff81..379b7a88 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1,4 +1,5 @@
 #include <baselib/system.h>
+#include <baselib/config.h>
 #include <baselib/input.h>
 #include <baselib/audio.h>
 #include <baselib/stream/file.h>
diff --git a/src/engine/config.cpp b/src/engine/config.cpp
index fc4dff1e..fb378190 100644
--- a/src/engine/config.cpp
+++ b/src/engine/config.cpp
@@ -66,6 +66,18 @@ void config_set(const char *line)
 
 void config_load(const char *filename)
 {
+	if (filename[0] == '~')
+	{
+		char *home = getenv("HOME");
+		if (home)
+		{
+			char full_path[1024];
+			sprintf(full_path, "%s%s", home, filename+1);
+			filename = full_path;
+		}
+	}
+
+
 	dbg_msg("config/load", "loading %s", filename);
 
 	file_stream file;
@@ -84,6 +96,18 @@ void config_load(const char *filename)
 
 void config_save(const char *filename)
 {
+	if (filename[0] == '~')
+	{
+		char *home = getenv("HOME");
+		if (home)
+		{
+			char full_path[1024];
+			sprintf(full_path, "%s%s", home, filename+1);
+			filename = full_path;
+		}
+	}
+
+
 	dbg_msg("config/save", "saving config to %s", filename);
 
 	file_stream file;
@@ -101,6 +125,8 @@ void config_save(const char *filename)
 
 		file.close();
 	}
+	else
+		dbg_msg("config/save", "couldn't open %s for writing. :(", filename);
 }
 
 #define MACRO_CONFIG_INT(name,def,min,max) int config_get_ ## name (configuration *c) { return c->name; }
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 7417054e..3769157e 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -3,6 +3,7 @@
 #include <cstdlib>
 
 #include <baselib/system.h>
+#include <baselib/config.h>
 
 #include <engine/interface.h>
 
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp
index 3066819c..a3b94356 100644
--- a/src/game/client/menu.cpp
+++ b/src/game/client/menu.cpp
@@ -9,12 +9,14 @@
 
 
 #include <baselib/system.h>
+#include <baselib/config.h>
 #include <baselib/input.h>
 #include <baselib/network.h>
 #include <baselib/math.h>
 
 #include <engine/interface.h>
 #include <engine/versions.h>
+#include <engine/config.h>
 #include "../mapres.h"
 
 #include <engine/client/ui.h>
-- 
cgit 1.4.1