diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-17 19:11:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-17 19:11:28 +0200 |
| commit | 8f7785771b9e02b1a1daf7a252550d78ea93053d (patch) | |
| tree | 7a4e4b524dbc63fed3dac99a3844b634cc621d0d /src/content_cao.cpp | |
| parent | 76be103a91d6987527af19e87d93007be8ba8a67 (diff) | |
| download | dragonfireclient-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.xz | |
Cpp11 initializers 2 (#5999)
* C++11 patchset 10: continue cleanup on constructors
* Drop obsolete bool MainMenuData::enable_public (setting is called with cURL in server loop)
* More classes cleanup
* More classes cleanup + change NULL tests to boolean tests
Diffstat (limited to 'src/content_cao.cpp')
| -rw-r--r-- | src/content_cao.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 0b9df6451..ac7b48e0d 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -202,7 +202,7 @@ void TestCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, void TestCAO::removeFromScene(bool permanent) { - if(m_node == NULL) + if (!m_node) return; m_node->remove(); @@ -220,7 +220,7 @@ v3s16 TestCAO::getLightPosition() void TestCAO::updateNodePos() { - if(m_node == NULL) + if (!m_node) return; m_node->setPosition(m_position); @@ -377,16 +377,16 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, void ItemCAO::removeFromScene(bool permanent) { - if(m_node == NULL) + if (!m_node) return; m_node->remove(); - m_node = NULL; + m_node = nullptr; } void ItemCAO::updateLight(u8 light_at_pos) { - if(m_node == NULL) + if (!m_node) return; u8 li = decode_light(light_at_pos); @@ -401,7 +401,7 @@ v3s16 ItemCAO::getLightPosition() void ItemCAO::updateNodePos() { - if(m_node == NULL) + if (!m_node) return; m_node->setPosition(m_position); @@ -428,7 +428,7 @@ void ItemCAO::updateInfoText() void ItemCAO::updateTexture() { - if(m_node == NULL) + if (!m_node) return; // Create an inventory item to see what is its image @@ -1155,13 +1155,13 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) updateTextures(m_previous_texture_modifier); } } - if(getParent() == NULL && fabs(m_prop.automatic_rotate) > 0.001) + if(!getParent() && fabs(m_prop.automatic_rotate) > 0.001) { m_yaw += dtime * m_prop.automatic_rotate * 180 / M_PI; updateNodePos(); } - if (getParent() == NULL && m_prop.automatic_face_movement_dir && + if (!getParent() && m_prop.automatic_face_movement_dir && (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) { float optimal_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI @@ -1408,7 +1408,7 @@ void GenericCAO::updateTextures(std::string mod) void GenericCAO::updateAnimation() { - if(m_animated_meshnode == NULL) + if (!m_animated_meshnode) return; if (m_animated_meshnode->getStartFrame() != m_animation_range.X || @@ -1426,7 +1426,7 @@ void GenericCAO::updateAnimation() void GenericCAO::updateBonePosition() { - if(m_bone_position.empty() || m_animated_meshnode == NULL) + if(m_bone_position.empty() || !m_animated_meshnode) return; m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render @@ -1447,7 +1447,7 @@ void GenericCAO::updateBonePosition() void GenericCAO::updateAttachments() { - if (getParent() == NULL) { // Detach or don't attach + if (!getParent()) { // Detach or don't attach scene::ISceneNode *node = getSceneNode(); if (node) { v3f old_position = node->getAbsolutePosition(); |