3 files changed, 16 insertions, 12 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 3f765645..de61ec09 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -17,7 +17,7 @@
 #include <engine/lzw.h>
 
 #include <engine/versions.h>
-#include <engine/config/config.h>
+#include <engine/config.h>
 
 using namespace baselib;
 
@@ -695,7 +695,7 @@ int main(int argc, char **argv)
 		{
 			// -n NAME
 			i++;
-			set_player_name(&config, argv[i]);
+			config_set_player_name(&config, argv[i]);
 		}
 		else if(argv[i][0] == '-' && argv[i][1] == 'w' && argv[i][2] == 0)
 		{
diff --git a/src/engine/config.cpp b/src/engine/config.cpp
index 844158c1..f38be184 100644
--- a/src/engine/config.cpp
+++ b/src/engine/config.cpp
@@ -12,12 +12,10 @@ void config_reset()
     #define MACRO_CONFIG_INT(name,def,min,max) config.name = def;
     #define MACRO_CONFIG_STR(name,len,def) strncpy(config.name, def, len);
  
-    #include "config_define.h" 
+    #include "config_variables.h" 
  
     #undef MACRO_CONFIG_INT 
     #undef MACRO_CONFIG_STR 
-
-	puts("woaaa");
 }
 
 void config_load(const char *filename)
@@ -25,8 +23,13 @@ void config_load(const char *filename)
 	dbg_msg("config/load", "loading %s", filename);
 }
 
-#define MACRO_CONFIG_INT(name,def,min,max) void set_ ## name (configuration *c, int val) { if (val < min) val = min; if (max != 0 && val > max) val = max; c->name = val; }
-#define MACRO_CONFIG_STR(name,len,def) void set_ ## name (configuration *c, char *str) { strncpy(c->name, def, len-1); c->name[sizeof(c->name)-1] = 0; }
-#include "config_define.h"
+void config_save(const char *filename)
+{
+	dbg_msg("config/save", "saving config to %s", filename);
+}
+
+#define MACRO_CONFIG_INT(name,def,min,max) void config_set_ ## name (configuration *c, int val) { if (val < min) val = min; if (max != 0 && val > max) val = max; c->name = val; }
+#define MACRO_CONFIG_STR(name,len,def) void config_set_ ## name (configuration *c, char *str) { strncpy(c->name, def, len-1); c->name[sizeof(c->name)-1] = 0; }
+#include "config_variables.h"
 #undef MACRO_CONFIG_INT
 #undef MACRO_CONFIG_STR
diff --git a/src/engine/config.h b/src/engine/config.h
index c1a356a5..04140bf5 100644
--- a/src/engine/config.h
+++ b/src/engine/config.h
@@ -5,7 +5,7 @@ struct configuration
 { 
     #define MACRO_CONFIG_INT(name,def,min,max) int name;
     #define MACRO_CONFIG_STR(name,len,def) char name[len];
-    #include "config_define.h" 
+    #include "config_variables.h" 
     #undef MACRO_CONFIG_INT 
     #undef MACRO_CONFIG_STR 
 }; 
@@ -14,10 +14,11 @@ extern configuration config;
 
 void config_reset();
 void config_load(const char *filename);
+void config_save(const char *filename);
 
-#define MACRO_CONFIG_INT(name,def,min,max) void set_ ## name (configuration *c, int val);
-#define MACRO_CONFIG_STR(name,len,def) void set_ ## name (configuration *c, char *str);
-#include "config_define.h"
+#define MACRO_CONFIG_INT(name,def,min,max) void config_set_ ## name (configuration *c, int val);
+#define MACRO_CONFIG_STR(name,len,def) void config_set_ ## name (configuration *c, char *str);
+#include "config_variables.h"
 #undef MACRO_CONFIG_INT
 #undef MACRO_CONFIG_STR