projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore messages.pot
[supertux.git]
/
src
/
object
/
gameobjs.cpp
diff --git
a/src/object/gameobjs.cpp
b/src/object/gameobjs.cpp
index
6a5d391
..
e863be3
100644
(file)
--- a/
src/object/gameobjs.cpp
+++ b/
src/object/gameobjs.cpp
@@
-24,7
+24,6
@@
#include <iostream>
#include <cmath>
#include <iostream>
#include <cmath>
-#include "app/globals.h"
#include "tile.h"
#include "tile_manager.h"
#include "game_session.h"
#include "tile.h"
#include "tile_manager.h"
#include "game_session.h"
@@
-35,6
+34,7
@@
#include "tilemap.h"
#include "video/drawing_context.h"
#include "camera.h"
#include "tilemap.h"
#include "video/drawing_context.h"
#include "camera.h"
+#include "main.h"
BouncyCoin::BouncyCoin(const Vector& pos)
: position(pos)
BouncyCoin::BouncyCoin(const Vector& pos)
: position(pos)