From 8a66e11280dce2e2512639f6ef472aacf1ec8af0 Mon Sep 17 00:00:00 2001
From: Jakob Fries <jakob.fries@gmail.com>
Date: Fri, 1 Jun 2007 11:12:48 +0000
Subject:

---
 src/engine/config.cpp             | 32 ++++++++++++++++++++++++++++++++
 src/engine/config.h               | 24 ++++++++++++++++++++++++
 src/engine/config/config.cpp      | 32 --------------------------------
 src/engine/config/config.h        | 24 ------------------------
 src/engine/config/config_define.h |  8 --------
 src/engine/config_define.h        |  8 ++++++++
 6 files changed, 64 insertions(+), 64 deletions(-)
 create mode 100644 src/engine/config.cpp
 create mode 100644 src/engine/config.h
 delete mode 100644 src/engine/config/config.cpp
 delete mode 100644 src/engine/config/config.h
 delete mode 100644 src/engine/config/config_define.h
 create mode 100644 src/engine/config_define.h

(limited to 'src')

diff --git a/src/engine/config.cpp b/src/engine/config.cpp
new file mode 100644
index 00000000..844158c1
--- /dev/null
+++ b/src/engine/config.cpp
@@ -0,0 +1,32 @@
+#include <baselib/system.h>
+
+#include <cstring>
+#include <cstdio>
+
+#include "config.h"
+
+configuration config;
+
+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" 
+ 
+    #undef MACRO_CONFIG_INT 
+    #undef MACRO_CONFIG_STR 
+
+	puts("woaaa");
+}
+
+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"
+#undef MACRO_CONFIG_INT
+#undef MACRO_CONFIG_STR
diff --git a/src/engine/config.h b/src/engine/config.h
new file mode 100644
index 00000000..c1a356a5
--- /dev/null
+++ b/src/engine/config.h
@@ -0,0 +1,24 @@
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+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" 
+    #undef MACRO_CONFIG_INT 
+    #undef MACRO_CONFIG_STR 
+}; 
+
+extern configuration config;
+
+void config_reset();
+void config_load(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"
+#undef MACRO_CONFIG_INT
+#undef MACRO_CONFIG_STR
+
+#endif
diff --git a/src/engine/config/config.cpp b/src/engine/config/config.cpp
deleted file mode 100644
index 844158c1..00000000
--- a/src/engine/config/config.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <baselib/system.h>
-
-#include <cstring>
-#include <cstdio>
-
-#include "config.h"
-
-configuration config;
-
-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" 
- 
-    #undef MACRO_CONFIG_INT 
-    #undef MACRO_CONFIG_STR 
-
-	puts("woaaa");
-}
-
-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"
-#undef MACRO_CONFIG_INT
-#undef MACRO_CONFIG_STR
diff --git a/src/engine/config/config.h b/src/engine/config/config.h
deleted file mode 100644
index c1a356a5..00000000
--- a/src/engine/config/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _CONFIG_H
-#define _CONFIG_H
-
-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" 
-    #undef MACRO_CONFIG_INT 
-    #undef MACRO_CONFIG_STR 
-}; 
-
-extern configuration config;
-
-void config_reset();
-void config_load(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"
-#undef MACRO_CONFIG_INT
-#undef MACRO_CONFIG_STR
-
-#endif
diff --git a/src/engine/config/config_define.h b/src/engine/config/config_define.h
deleted file mode 100644
index 0b1fed7e..00000000
--- a/src/engine/config/config_define.h
+++ /dev/null
@@ -1,8 +0,0 @@
-MACRO_CONFIG_INT(screen_width, 800, 0, 0)
-MACRO_CONFIG_INT(screen_height, 600, 0, 0)
-MACRO_CONFIG_STR(player_name, 32, "nameless tee")
-MACRO_CONFIG_INT(key_move_left, 65, 32, 127)
-MACRO_CONFIG_INT(key_move_right, 68, 32, 127)
-MACRO_CONFIG_INT(key_jump, 32, 32, 127)
-MACRO_CONFIG_INT(key_fire, 33, 32, 127)
-MACRO_CONFIG_INT(key_hook, 34, 32, 127)
diff --git a/src/engine/config_define.h b/src/engine/config_define.h
new file mode 100644
index 00000000..0b1fed7e
--- /dev/null
+++ b/src/engine/config_define.h
@@ -0,0 +1,8 @@
+MACRO_CONFIG_INT(screen_width, 800, 0, 0)
+MACRO_CONFIG_INT(screen_height, 600, 0, 0)
+MACRO_CONFIG_STR(player_name, 32, "nameless tee")
+MACRO_CONFIG_INT(key_move_left, 65, 32, 127)
+MACRO_CONFIG_INT(key_move_right, 68, 32, 127)
+MACRO_CONFIG_INT(key_jump, 32, 32, 127)
+MACRO_CONFIG_INT(key_fire, 33, 32, 127)
+MACRO_CONFIG_INT(key_hook, 34, 32, 127)
-- 
cgit 1.4.1