summaryrefslogtreecommitdiff
path: root/src/collision.h
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-06-16 11:25:52 +0200
committerGitHub <noreply@github.com>2017-06-16 11:25:52 +0200
commit76be103a91d6987527af19e87d93007be8ba8a67 (patch)
treec83c21e7c0adc37251f77788023eb3c242a751ca /src/collision.h
parent49d6e5f4ab79078d1608c22a9cce286b3cf86eb9 (diff)
downloadminetest-76be103a91d6987527af19e87d93007be8ba8a67.tar.gz
minetest-76be103a91d6987527af19e87d93007be8ba8a67.tar.bz2
minetest-76be103a91d6987527af19e87d93007be8ba8a67.zip
C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) (#5984)
* C++11 patchset 9: move hardcoded init parameters to class definitions C++11 introduced the possibility to define the default values directly in class definitions, do it on current code Also remove some unused attributes * CollisionInfo::bouncy * collisionMoveResult::collides_xy * collisionMoveResult::standing_on_unloaded * Clouds::speed * More constructor cleanups + some variables removal * remove only write guiFormSpecMenu::m_old_tooltip * move header included inside defintions in genericobject.h * remove some unused since years exception classes * remove unused & empty debug_stacks_init * remove unused & empty content_nodemeta_serialize_legacy * remove forgotten useless bool (bouncy) in collision.cpp code
Diffstat (limited to 'src/collision.h')
-rw-r--r--src/collision.h31
1 files changed, 7 insertions, 24 deletions
diff --git a/src/collision.h b/src/collision.h
index 1ceaba81c..50755224b 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -36,37 +36,20 @@ enum CollisionType
struct CollisionInfo
{
- enum CollisionType type;
- v3s16 node_p; // COLLISION_NODE
- bool bouncy;
+ CollisionInfo() {}
+ CollisionType type = COLLISION_NODE;
+ v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
v3f old_speed;
v3f new_speed;
-
- CollisionInfo():
- type(COLLISION_NODE),
- node_p(-32768,-32768,-32768),
- bouncy(false),
- old_speed(0,0,0),
- new_speed(0,0,0)
- {}
};
struct collisionMoveResult
{
- bool touching_ground;
- bool collides;
- bool collides_xz;
- bool standing_on_unloaded;
- bool standing_on_object;
+ collisionMoveResult() {}
+ bool touching_ground = false;
+ bool collides = false;
+ bool standing_on_object = false;
std::vector<CollisionInfo> collisions;
-
- collisionMoveResult():
- touching_ground(false),
- collides(false),
- collides_xz(false),
- standing_on_unloaded(false),
- standing_on_object(false)
- {}
};
// Moves using a single iteration; speed should not exceed pos_max_d/dtime