diff options
| author | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
| commit | 1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124 (patch) | |
| tree | 54660f353f3342f89b6259ea6a5dfedfa20dc16f /src/collision.cpp | |
| parent | ec039a3d123120f9918812b13f5971e94546b9af (diff) | |
| parent | 64627817fcca52f20948c24b60ce192b218f6ce2 (diff) | |
| download | minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.gz minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.bz2 minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/collision.cpp b/src/collision.cpp index 673966b6e..3058426eb 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -298,7 +298,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, f32 distance = speed_f.getLength(); std::vector<DistanceSortedActiveObject> clientobjects; c_env->getActiveObjects(pos_f,distance * 1.5,clientobjects); - for (int i=0; i < clientobjects.size(); i++) + for (size_t i=0; i < clientobjects.size(); i++) { if ((self == 0) || (self != clientobjects[i].obj)) { objects.push_back((ActiveObject*)clientobjects[i].obj); |