Merged removal of dependency on Guichan OpenGL from trunk to 0.0 branch,

including optimization of OpenGL memory usage on modern OpenGL drivers. 
Patches by Guillaume Melquiond.

1 files changed, 12 insertions, 1 deletions

diff --git a/src/main.h b/src/main.h
index 5787756a..c18a2ddd 100644
--- a/src/main.h
+++ b/src/main.h
@@ -36,7 +36,9 @@
 #define TMW_DATADIR ""
 #endif
 
-
+/*
+ * Client different States
+ */
 enum {
     EXIT_STATE,
     LOADDATA_STATE,
@@ -65,6 +67,15 @@ enum {
     LEN_MIN_PASSWORD     = 4
 };
 
+// Default game values
+// -------------------
+// Screen
+const short defaultScreenWidth = 800;
+const short defaultScreenHeight = 600;
+// Sound
+const short defaultSfxVolume = 100;
+const short defaultMusicVolume = 60;
+
 extern char n_server, n_character;
 extern unsigned char state;
 extern std::string errorMessage;