setup config to be one file

[physics.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 6f5ed03..5381a86 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,3 +1,20 @@
+/*
+ *  Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <SDL/SDL.h>
@@ -10,6 +27,7 @@
 
 #include "graphics/graphics.h"
 #include "input/inputManager.h"
+#include "config/config.h"
 
 /// ***** Private Method Headers *****
 
@@ -23,7 +41,7 @@ void clean();
 void blockUpdate();
 void updateFPSCounters();
 
-void input();
+void handleInput();
 void update(float);
 void draw();
 
@@ -67,11 +85,13 @@ void init()
 {
     installSignal();
 
-    graphicsInit();
+    graphics::init();
 
-    gameInit();
+    game::init();
 
-    inputInit();
+    input::init();
+
+    cfg::init();
 
 #ifdef DEBUGGING
     cout << "Initialization Complete" << endl;
@@ -84,11 +104,13 @@ void clean()
     cout << "Cleaning up" << endl;
 #endif
 
-    inputClean();
+    cfg::clean();
+
+    input::clean();
 
-    gameClean();
+    game::clean();
 
-    graphicsClean();
+    graphics::clean();
 }
 
 /// ***** Private Methods *****
@@ -127,7 +149,7 @@ void blockUpdate()
         // run the updates
         for (int i = 1; i <= iupdate_sum; i++)
         {
-            input();
+            handleInput();
             update(time_step*i / 1000);
         }
         // remove the updates that where run from the sum
@@ -155,13 +177,13 @@ void updateFPSCounters()
     }
 }
 
-void input()
+void handleInput()
 {
-    inputUpdate();
+    input::update();
 
-    gameInput();
+    game::input();
 
-    if(wasReleased(SDLK_ESCAPE))
+    if(cfg::endGame())
         is_Running = false;
 }
 
@@ -169,14 +191,14 @@ void update(float time_step)
 {
     update_Count++;
 
-    gameUpdate(time_step);
+    game::update(time_step);
 }
 
 void draw()
 {
     draw_Count++;
 
-    gameDraw();
+    game::draw();
 
     SDL_GL_SwapBuffers();