moved into config manager

somaen · Jul 31, 2008 · c629b26 · c629b26
1 parent 211d03b
commit c629b26
Show file tree

Hide file tree

Showing 19 changed files with 798 additions and 212 deletions.
diff --git a/README b/README
@@ -63,9 +63,11 @@ By default, the configuration file is saved in, and loaded from:
         residual.ini in the current directory
 
 An example config file looks as follows:
+	[residual]
 
-       DataDir=[path to all the .lab files]
-       good_times=TRUE
+	[grim]
+	path=[path to all the .lab files]
+	game_devel_mode=TRUE
 
 It runs really slow when using -zbuffer!
 ----------------------------------------

diff --git a/common/config-file.cpp b/common/config-file.cpp
@@ -203,7 +203,12 @@ bool ConfigFile::saveToStream(WriteStream &stream) {
 		stream.writeByte('[');
 		stream.writeString(i->name);
 		stream.writeByte(']');
+#ifdef _WIN32
+		stream.writeByte(0x0d);
+		stream.writeByte(0x0a);
+#else
 		stream.writeByte('\n');
+#endif
 
 		// Write out the key/value pairs
 		for (List<KeyValue>::iterator kv = i->keys.begin(); kv != i->keys.end(); ++kv) {
@@ -215,7 +220,12 @@ bool ConfigFile::saveToStream(WriteStream &stream) {
 			stream.writeString(kv->key);
 			stream.writeByte('=');
 			stream.writeString(kv->value);
+#ifdef _WIN32
+			stream.writeByte(0x0d);
+			stream.writeByte(0x0a);
+#else
 			stream.writeByte('\n');
+#endif
 		}
 	}
 

diff --git a/common/config-manager.cpp b/common/config-manager.cpp
@@ -32,7 +32,6 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/util.h"
-#include "common/debug.h"
 
 DECLARE_SINGLETON(Common::ConfigManager);
 
@@ -173,7 +172,11 @@ void ConfigManager::loadFile(const String &filename) {
 
 			// Read a line
 			String line;
+#ifdef _WIN32
+			while (line.lastChar() != 0x0a) {
+#else
 			while (line.lastChar() != '\n') {
+#endif
 				char buf[MAXLINELEN];
 				if (!cfg_file.readLine_NEW(buf, MAXLINELEN))
 					break;
@@ -324,7 +327,12 @@ void ConfigManager::writeDomain(WriteStream &stream, const String &name, const D
 	stream.writeByte('[');
 	stream.writeString(name);
 	stream.writeByte(']');
+#ifdef _WIN32
+	stream.writeByte(0x0d);
+	stream.writeByte(0x0a);
+#else
 	stream.writeByte('\n');
+#endif
 
 	// Write all key/value pairs in this domain, including comments
 	Domain::const_iterator x;
@@ -339,10 +347,20 @@ void ConfigManager::writeDomain(WriteStream &stream, const String &name, const D
 			stream.writeString(x->_key);
 			stream.writeByte('=');
 			stream.writeString(x->_value);
+#ifdef _WIN32
+			stream.writeByte(0x0d);
+			stream.writeByte(0x0a);
+#else
 			stream.writeByte('\n');
+#endif
 		}
 	}
+#ifdef _WIN32
+	stream.writeByte(0x0d);
+	stream.writeByte(0x0a);
+#else
 	stream.writeByte('\n');
+#endif
 }
 
 

diff --git a/common/sys.h b/common/sys.h
@@ -248,6 +248,18 @@ extern "C" int residual_main(int argc, char *argv[]);
 	#endif
 #endif
 
+//
+// GCC specific stuff
+//
+#if defined(__GNUC__)
+	#define NORETURN __attribute__((__noreturn__))
+	#define PACKED_STRUCT __attribute__((packed))
+	#define GCC_PRINTF(x, y) __attribute__((format(printf, x, y)))
+#else
+	#define PACKED_STRUCT
+	#define GCC_PRINTF(x, y)
+#endif
+
 //
 // Fallbacks / default values for various special macros
 //

diff --git a/common/util.h b/common/util.h
@@ -28,6 +28,10 @@
 #include "common/sys.h"
 #include "common/debug.h"
 
+#if defined(WIN32)
+#include <windows.h>
+#endif
+
 #ifdef MIN
 #undef MIN
 #endif

diff --git a/dists/msvc7/residual.vcproj b/dists/msvc7/residual.vcproj
@@ -252,6 +252,12 @@
 			<File
 				RelativePath="..\..\engine\bitmap.h">
 			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.cpp">
+			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.h">
+			</File>
 			<File
 				RelativePath="..\..\engine\color.h">
 			</File>

diff --git a/dists/msvc71/residual.vcproj b/dists/msvc71/residual.vcproj
@@ -266,6 +266,12 @@
 			<File
 				RelativePath="..\..\engine\bitmap.h">
 			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.cpp">
+			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.h">
+			</File>
 			<File
 				RelativePath="..\..\engine\color.h">
 			</File>

diff --git a/dists/msvc8/residual.vcproj b/dists/msvc8/residual.vcproj
@@ -375,6 +375,14 @@
 				RelativePath="..\..\engine\bitmap.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\engine\color.h"
 				>

diff --git a/dists/msvc9/residual.vcproj b/dists/msvc9/residual.vcproj
@@ -380,6 +380,14 @@
 				RelativePath="..\..\engine\bitmap.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engine\cmd_line.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\engine\color.h"
 				>

diff --git a/dists/residual.ini.example b/dists/residual.ini.example
@@ -1,2 +1,6 @@
-DataDir=C:\Games\Grim
-good_times=TRUE
+[residual]
+
+[grim]
+path=C:\Games\Grim
+show_fps=TRUE
+game_devel_mode=TRUE