Changeset 5925 for code/branches/core5/src/orxonox/graphics

Timestamp:

Oct 9, 2009, 6:46:54 PM (15 years ago)

Author:

rgrieder

Message:

Reapplied some of the changes that got reverted in the last commit (including two fixes).

File:

• code/branches/core5/src/orxonox/graphics/Camera.cc (modified) (3 diffs)

code/branches/core5/src/orxonox/graphics/Camera.cc

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/GameMode.h"
 #include "core/GUIManager.h"
 #include "Scene.h"
@@ -50 +51 @@
         RegisterObject(Camera);
 
+        if (!GameMode::showsGraphics())
+            ThrowException(AbortLoading, "Can't create Camera, no graphics.");
         if (!this->getScene())
             ThrowException(AbortLoading, "Can't create Camera, no scene.");
@@ -76 +79 @@
         if (this->isInitialized())
         {
-            if( GUIManager::getInstance().getCamera() == this->camera_ )
-                GUIManager::getInstance().setCamera( NULL );
+            if (GUIManager::getInstance().getCamera() == this->camera_)
+                GUIManager::getInstance().setCamera(NULL);
             this->releaseFocus();