diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/collision.cpp | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 8 |
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" |