projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed src so the libpg headers are now used
[physics.git]
/
src
/
config
/
reader.cpp
diff --git
a/src/config/reader.cpp
b/src/config/reader.cpp
index
f3dbdd1
..
3f370e3
100644
(file)
--- a/
src/config/reader.cpp
+++ b/
src/config/reader.cpp
@@
-16,7
+16,8
@@
*/
#include "reader.h"
*/
#include "reader.h"
-#include "../debug.h"
+
+#include <pg/debug.h>
#include <iostream>
using std::cerr;
#include <iostream>
using std::cerr;
@@
-43,7
+44,7
@@
void createKeyMap();
/// ***** Private Variables *****
const char* configDir = "configs/";
/// ***** Private Variables *****
const char* configDir = "configs/";
-const char* testFile = "
test2
.cfg";
+const char* testFile = "
keys
.cfg";
/// ***** Public Methods *****
/// ***** Public Methods *****
@@
-97,9
+98,6
@@
void processLine(const string& str)
{
*(key::sdlMap[name]) = key;
}
{
*(key::sdlMap[name]) = key;
}
- cout << name << endl;
- cout << value << endl;
- cout << key << endl;
}
}
}
}
@@
-121,11
+119,11
@@
bool extractLine(const string& str, string* name, string* value)
int char_pos = 0;
int char_pos = 0;
- int name_start;
- int name_end;
+ int name_start
= 0
;
+ int name_end
= 0
;
- int value_start;
- int value_end;
+ int value_start
= 0
;
+ int value_end
= 0
;
const char* c_str = str.c_str();
const char* c_str = str.c_str();
@@
-211,7
+209,7
@@
void createKeyMap()
for (int i = 'A'; i <= 'Z'; i++) // uppercase
{
buf[0] = (char)i;
for (int i = 'A'; i <= 'Z'; i++) // uppercase
{
buf[0] = (char)i;
- keyMap[buf] = (SDLKey)
i
;
+ keyMap[buf] = (SDLKey)
(i + 'a' - 'A')
;
}
for (int i = 'a'; i <= 'z'; i++) // lowercase
{
}
for (int i = 'a'; i <= 'z'; i++) // lowercase
{