Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / src / CConfig.h

diff --git a/src/CConfig.h b/src/CConfig.h
old mode 100755 (executable)
new mode 100644 (file)
index 3a288cd..e1460ed
--- a/src/CConfig.h
+++ b/src/CConfig.h
@@ -1,30 +1,30 @@
-class Config\r
-{\r
-       public:\r
-       \r
-               Engine *engine;\r
-\r
-               int command[CONTROL::MAX];\r
-               \r
-               SDL_Joystick *sdlJoystick;\r
-               \r
-               Joystick joystick;\r
-               Keyboard keyboard;\r
-\r
-       Config();\r
-       ~Config();\r
-       \r
-       void populate();\r
-       void populate(int *data);\r
-       \r
-       bool isControl(CONTROL::TYPE type);\r
-       void resetControl(CONTROL::TYPE type);\r
-       \r
-       void doPause();\r
-       \r
-       bool loadJoystickConfig();\r
-       bool saveJoystickConfig();\r
-       bool loadKeyConfig();\r
-       bool saveKeyConfig();\r
-       void restoreKeyDefaults();\r
-};\r
+class Config
+{
+       public:
+       
+               Engine *engine;
+
+               int command[CONTROL::MAX];
+               
+               SDL_Joystick *sdlJoystick;
+               
+               Joystick joystick;
+               Keyboard keyboard;
+
+       Config();
+       ~Config();
+       
+       void populate();
+       void populate(int *data);
+       
+       bool isControl(CONTROL::TYPE type) const;
+       void resetControl(CONTROL::TYPE type);
+       
+       void doPause();
+       
+       bool loadJoystickConfig();
+       bool saveJoystickConfig();
+       bool loadKeyConfig();
+       bool saveKeyConfig();
+       void restoreKeyDefaults();
+};