diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2014-11-14 18:05:34 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2014-11-14 18:05:34 +1000 |
| commit | 5b8855e83c0d1cc7aef21492e7fe862b7d06917e (patch) | |
| tree | b05139dcea07222cfa3fab23064eeef0076c8019 /src/collision.cpp | |
| parent | 92815ad54b23fe92742ebca7263bb227149248c1 (diff) | |
| download | minetest-5b8855e83c0d1cc7aef21492e7fe862b7d06917e.tar.gz minetest-5b8855e83c0d1cc7aef21492e7fe862b7d06917e.tar.bz2 minetest-5b8855e83c0d1cc7aef21492e7fe862b7d06917e.zip | |
Remove most exceptions from getNode() (and variants)
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/collision.cpp b/src/collision.cpp index edbee40b9..9e0c85531 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -251,9 +251,13 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, for(s16 z = min_z; z <= max_z; z++) { v3s16 p(x,y,z); - try{ + + bool is_position_valid; + MapNode n = map->getNodeNoEx(p, &is_position_valid); + + if (is_position_valid) { // Object collides into walkable nodes - MapNode n = map->getNode(p); + const ContentFeatures &f = gamedef->getNodeDefManager()->get(n); if(f.walkable == false) continue; @@ -275,8 +279,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, is_object.push_back(false); } } - catch(InvalidPositionException &e) - { + else { // Collide with unloaded nodes aabb3f box = getNodeBox(p, BS); cboxes.push_back(box); |