diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-16 11:25:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-16 11:25:52 +0200 |
commit | 76be103a91d6987527af19e87d93007be8ba8a67 (patch) | |
tree | c83c21e7c0adc37251f77788023eb3c242a751ca /src/clouds.h | |
parent | 49d6e5f4ab79078d1608c22a9cce286b3cf86eb9 (diff) | |
download | minetest-76be103a91d6987527af19e87d93007be8ba8a67.tar.xz |
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/clouds.h')
-rw-r--r-- | src/clouds.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/clouds.h b/src/clouds.h index a0bda28df..869f7f7fc 100644 --- a/src/clouds.h +++ b/src/clouds.h @@ -53,7 +53,7 @@ public: virtual void OnRegisterSceneNode(); virtual void render(); - + virtual const aabb3f &getBoundingBox() const { return m_box; @@ -68,7 +68,7 @@ public: { return m_material; } - + /* Other stuff */ @@ -76,7 +76,7 @@ public: void step(float dtime); void update(v2f camera_p, video::SColorf color); - + void updateCameraOffset(v3s16 camera_offset) { m_camera_offset = camera_offset; @@ -135,9 +135,8 @@ private: u32 m_seed; v2f m_camera_pos; v2f m_origin; - v2f m_speed; v3s16 m_camera_offset; - video::SColorf m_color; + video::SColorf m_color = video::SColorf(1.0f, 1.0f, 1.0f, 1.0f); CloudParams m_params; }; |