Changeset 6695 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 25, 2006, 2:39:53 PM (18 years ago)

Author:

patrick

Message:

merged the network branche to the trunk

File:

• trunk/src/world_entities/space_ships/space_ship.cc (modified) (3 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -97 +97 @@
   if (root != NULL)
     this->loadParams(root);
+  else
+  {
+    this->loadModel("models/ships/reap_#.obj");
+  }
+
+}
+
+
+/**
+ * initializes a Spaceship
+ */
+void SpaceShip::init()
+{
+//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
+  this->setClassID(CL_SPACE_SHIP, "SpaceShip");
+
+  PRINTF(4)("SPACESHIP INIT\n");
 
   //weapons:
@@ -112 +129 @@
 
   this->getWeaponManager()->changeWeaponConfig(1);
-}
-
-
-/**
- * initializes a Spaceship
- */
-void SpaceShip::init()
-{
-//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_SPACE_SHIP, "SpaceShip");
-
-  PRINTF(4)("SPACESHIP INIT\n");
 
   EventHandler::getInstance()->grabEvents(true);
@@ -206 +211 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 }
+
 
 /**