projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
setup config to be one file
[physics.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
60fb834
..
5381a86
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-27,6
+27,7
@@
#include "graphics/graphics.h"
#include "input/inputManager.h"
#include "graphics/graphics.h"
#include "input/inputManager.h"
+#include "config/config.h"
/// ***** Private Method Headers *****
/// ***** Private Method Headers *****
@@
-90,6
+91,8
@@
void init()
input::init();
input::init();
+ cfg::init();
+
#ifdef DEBUGGING
cout << "Initialization Complete" << endl;
#endif
#ifdef DEBUGGING
cout << "Initialization Complete" << endl;
#endif
@@
-101,6
+104,8
@@
void clean()
cout << "Cleaning up" << endl;
#endif
cout << "Cleaning up" << endl;
#endif
+ cfg::clean();
+
input::clean();
game::clean();
input::clean();
game::clean();
@@
-178,7
+183,7
@@
void handleInput()
game::input();
game::input();
- if(
input::wasReleased(SDLK_ESCAPE
))
+ if(
cfg::endGame(
))
is_Running = false;
}
is_Running = false;
}