summaryrefslogtreecommitdiff
path: root/src/collision.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/collision.cpp')
-rw-r--r--src/collision.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/collision.cpp b/src/collision.cpp
index 8e5dbcc9b..c0891c152 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -22,11 +22,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "map.h"
#include "nodedef.h"
#include "gamedef.h"
-#include "log.h"
-#include "environment.h"
+#ifndef SERVER
+#include "clientenvironment.h"
+#endif
+#include "serverenvironment.h"
#include "serverobject.h"
-#include <vector>
-#include <set>
#include "util/timetaker.h"
#include "profiler.h"