projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for squirrel on 64 bit
[supertux.git]
/
src
/
gameconfig.cpp
diff --git
a/src/gameconfig.cpp
b/src/gameconfig.cpp
index
18c2dd2
..
2387c8c
100644
(file)
--- a/
src/gameconfig.cpp
+++ b/
src/gameconfig.cpp
@@
-26,17
+26,14
@@
#include <sstream>
#include <fstream>
#include <sstream>
#include <fstream>
-#include "app/setup.h"
-#include "app/globals.h"
#include "audio/sound_manager.h"
#include "lisp/parser.h"
#include "lisp/lisp.h"
#include "lisp/writer.h"
#include "control/joystickkeyboardcontroller.h"
#include "audio/sound_manager.h"
#include "lisp/parser.h"
#include "lisp/lisp.h"
#include "lisp/writer.h"
#include "control/joystickkeyboardcontroller.h"
+#include "resources.h"
#include "main.h"
#include "main.h"
-using namespace SuperTux;
-
Config* config = 0;
Config::Config()
Config* config = 0;
Config::Config()