projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more debug changes
[physics.git]
/
src
/
config
/
config.cpp
diff --git
a/src/config/config.cpp
b/src/config/config.cpp
index
35efe4f
..
3b694ba
100644
(file)
--- a/
src/config/config.cpp
+++ b/
src/config/config.cpp
@@
-16,6
+16,12
@@
*/
#include "config.h"
*/
#include "config.h"
+#include "../debug.h"
+
+#include <SDL/SDL.h>
+#include "keys.h"
+
+#include "reader.h"
#include "../input/inputManager.h"
/// ***** Private Method Headers *****
#include "../input/inputManager.h"
/// ***** Private Method Headers *****
@@
-25,6
+31,9
@@
void cfg::init()
{
void cfg::init()
{
+ key::init();
+ readConfigs();
+
// TODO read in config files
}
void cfg::clean()
// TODO read in config files
}
void cfg::clean()
@@
-36,29
+45,29
@@
void cfg::clean()
bool cfg::pause()
{
bool cfg::pause()
{
- return input::wasPressed(
SDLK_p
);
+ return input::wasPressed(
key::pause
);
}
bool cfg::unPause()
{
}
bool cfg::unPause()
{
- return input::wasPressed(
SDLK_p
);
+ return input::wasPressed(
key::pause
);
}
bool cfg::endGame()
{
}
bool cfg::endGame()
{
- return input::wasReleased(
SDLK_ESCAPE
);
+ return input::wasReleased(
key::end
);
}
bool cfg::mouseWellFollow()
{
}
bool cfg::mouseWellFollow()
{
- return input::isPressed(
SDLK_f
);
+ return input::isPressed(
key::follow
);
}
bool cfg::mouseWellOn()
{
}
bool cfg::mouseWellOn()
{
- return input::wasPressed(
SDLK_SPACE
);
+ return input::wasPressed(
key::well
);
}
bool cfg::mouseWellOff()
{
}
bool cfg::mouseWellOff()
{
- return input::wasReleased(
SDLK_SPACE
);
+ return input::wasReleased(
key::well
);
}
/// ***** Private Methods *****
}
/// ***** Private Methods *****