Changeset 10387 in orxonox.OLD for trunk/src/world_entities/npcs

Timestamp:

Jan 26, 2007, 6:22:33 PM (18 years ago)

Author:

patrick

Message:

removed the segfault for npcs, adding clouds to planets

File:

• trunk/src/world_entities/npcs/npc.cc (modified) (1 diff)

trunk/src/world_entities/npcs/npc.cc

@@ -64 +64 @@
 
   this->getWeaponManager().changeWeaponConfig(1);
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
-
-  wpRight->toList( this->getOMListNumber());
-  wpLeft->toList( this->getOMListNumber());
-
-
-  this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
-
-  wpLeft->increaseEnergy( 100);
-  wpRight->increaseEnergy( 100);
+//   Weapon* wpRight = new TestGun(0);
+//   wpRight->setName("testGun Right");
+//   Weapon* wpLeft = new TestGun(1);
+//   wpLeft->setName("testGun Left");
+//
+//   wpRight->toList( this->getOMListNumber());
+//   wpLeft->toList( this->getOMListNumber());
+//
+//
+//   this->addWeapon(wpLeft, 1, 0);
+//   this->addWeapon(wpRight,1 ,1);
+//
+//   wpLeft->increaseEnergy( 100);
+//   wpRight->increaseEnergy( 100);
 
   this->setHealthMax(100);
   this->setHealth(80);
 
-  this->getWeaponManager().setSlotCount(7);
-
-  this->getWeaponManager().setSlotPosition(0, Vector(-2.6, .1, -3.0));
-  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager().setSlotPosition(1, Vector(-2.6, .1, 3.0));
-  this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager().setSlotPosition(2, Vector(-1.5, .5, -.5));
-  this->getWeaponManager().setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(3, Vector(-1.5, .5, .5));
-  this->getWeaponManager().setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(4, Vector(-1.5, -.5, .5));
-  this->getWeaponManager().setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(5, Vector(-1.5, -.5, -.5));
-  this->getWeaponManager().setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(6, Vector(-1, 0.0, 0));
-  this->getWeaponManager().setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager().getFixedTarget()->setParent(this);
-  this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
+//   this->getWeaponManager().setSlotCount(7);
+//
+//   this->getWeaponManager().setSlotPosition(0, Vector(-2.6, .1, -3.0));
+//   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//
+//   this->getWeaponManager().setSlotPosition(1, Vector(-2.6, .1, 3.0));
+//   this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//
+//   this->getWeaponManager().setSlotPosition(2, Vector(-1.5, .5, -.5));
+//   this->getWeaponManager().setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
+//
+//   this->getWeaponManager().setSlotPosition(3, Vector(-1.5, .5, .5));
+//   this->getWeaponManager().setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
+//
+//   this->getWeaponManager().setSlotPosition(4, Vector(-1.5, -.5, .5));
+//   this->getWeaponManager().setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+//
+//   this->getWeaponManager().setSlotPosition(5, Vector(-1.5, -.5, -.5));
+//   this->getWeaponManager().setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
+//
+//   this->getWeaponManager().setSlotPosition(6, Vector(-1, 0.0, 0));
+//   this->getWeaponManager().setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//
+//   this->getWeaponManager().getFixedTarget()->setParent(this);
+//   this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
 
 }