Changeset 2077 for code/branches/lod

Timestamp:

Oct 31, 2008, 1:29:04 PM (16 years ago)

Author:

FelixSchulthess

Message:

-l command line option works now

Location:

code/branches/lod/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/SpaceShip.cc (modified) (2 diffs)

code/branches/lod/src/orxonox/CMakeLists.txt

@@ -94 +94 @@
     objects/SpaceShip.cc
     objects/WorldEntity.cc
-    objects/Planet.cc
   )
 

code/branches/lod/src/orxonox/objects/SpaceShip.cc

@@ -179 +179 @@
                 myShip_ = true;
             }
-            else
-                this->setRadarObjectColour(this->getProjectileColour());
-      }
-      Model::create();
-      this->init();
-      return true;
+        }
+        else
+            this->setRadarObjectColour(this->getProjectileColour());
+        Model::create();
+        this->init();
+        return true;
     }
 
@@ -258 +258 @@
             if(!network::Host::running()){
               this->backlight_ = new Backlight(this->maxSpeed_, 0.8);
-              this->backlight_->create();
               this->attachObject(this->backlight_);
               this->backlight_->setPosition(-2.35, 0, 0.2);
+              this->backlight_->create();
               this->backlight_->setColour(this->getProjectileColour());