From 95853787b339befe5dd22d18f89ce92867d9f20a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 14 Apr 2016 09:37:20 +1000
Subject: [PATCH] Minor code cleanup.

---
 src/graphics/camera.cpp | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index c4cc7ec43..98c2162e3 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -58,23 +58,9 @@ Camera::Camera(int camera_index, AbstractKart* kart) : m_kart(NULL)
     m_camera        = irr_driver->addCameraSceneNode();
     m_previous_pv_matrix = core::matrix4();
 
-#ifdef DEBUG
-    if (kart != NULL)
-        m_camera->setName(core::stringc("Camera for ") + kart->getKartProperties()->getName());
-    else
-        m_camera->setName("Camera");
-#endif
-
     setupCamera();
-    if (kart != NULL)
-    {
-        m_distance = kart->getKartProperties()->getCameraDistance();
-        setKart(kart);
-    }
-    else
-    {
-        m_distance = 1000.0f;
-    }
+    setKart(kart);
+    m_distance = kart ? kart->getKartProperties()->getCameraDistance() : 1000.0f;
     m_ambient_light = World::getWorld()->getTrack()->getDefaultAmbientColor();
 
     // TODO: Put these values into a config file
@@ -168,11 +154,9 @@ void Camera::setKart(AbstractKart *new_kart)
 {
     m_kart = new_kart;
 #ifdef DEBUG
-    if(new_kart)
-    {
-        std::string name = new_kart->getIdent()+"'s camera";
-        getCameraSceneNode()->setName(name.c_str() );
-    }
+    std::string name = new_kart ? new_kart->getIdent()+"'s camera"
+                                : "Unattached camera";
+    getCameraSceneNode()->setName(name.c_str());
 #endif
 
 }   // setKart