Changeset 2171 for code/trunk/src/orxonox/objects/worldentities/Camera.cc

Timestamp:

Nov 10, 2008, 12:05:03 AM (17 years ago)

Author:

landauf

Message:

merged revisions 2111-2170 from objecthierarchy branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.cc (modified) (2 diffs, 1 prop)

code/trunk/src/orxonox/objects/worldentities/Camera.cc

@@ -38 +38 @@
 #include <OgreViewport.h>
 
+#include "util/Exception.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -51 +52 @@
         RegisterObject(Camera);
 
-        assert(this->getScene());
-        assert(this->getScene()->getSceneManager());
+        if (!this->getScene() || !this->getScene()->getSceneManager())
+            ThrowException(AbortLoading, "Can't create Camera, no scene or no scene manager given.");
 
         this->camera_ = this->getScene()->getSceneManager()->createCamera(getUniqueNumberString());