Changeset 10550 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 6:33:43 AM (18 years ago)

Author:

patrick

Message:

mounting points now read also weapons

File:

• trunk/src/world_entities/npcs/npc.cc (modified) (4 diffs)

trunk/src/world_entities/npcs/npc.cc

@@ -81 +81 @@
   this->registerObject(this, NPC::_objectList);
 
-  this->toList(OM_GROUP_00);
+  this->toList(OM_GROUP_01);
   this->bAIEnabled = false;
 
@@ -318 +318 @@
     return;
 
-  LOAD_PARAM_START_CYCLE(root, element);
-  {
-    PRINTF(0)("got weapon: %s\n", element->Value());
-    BaseObject* obj = Factory::fabricate(element);
-    if( obj != NULL && obj->isA( Weapon::staticClassID()))
-    {
-      Weapon* w = dynamic_cast<Weapon*>(obj);
-      PRINTF(0)("created a weapon\n");
-      int preferedSlot = w->getPreferedSlot();
-      int preferedSide = w->getPreferedSide();
-
-      this->addWeapon( w, preferedSide, preferedSlot);
-    }
-  }
-  LOAD_PARAM_END_CYCLE(element);
+//   LOAD_PARAM_START_CYCLE(root, element);
+//   {
+// //     PRINTF(0)("got weapon: %s\n", element->Value());
+//     BaseObject* obj = Factory::fabricate(element);
+//     if( obj != NULL && obj->isA( Weapon::staticClassID()))
+//     {
+//       Weapon* w = dynamic_cast<Weapon*>(obj);
+// //       PRINTF(0)("created a weapon\n");
+//       int preferedSlot = w->getPreferedSlot();
+//       int preferedSide = w->getPreferedSide();
+//
+//       this->addWeapon( w, preferedSide, preferedSlot);
+//     }
+//   }
+//   LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -411 +411 @@
         this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
         this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
-        PRINTF(0)("setting slot %i\n", slot);
-        (*it).second->getCenter().debug();
+//         PRINTF(0)("setting slot %i\n", slot);
+//         (*it).second->getCenter().debug();
       }
     }
@@ -423 +423 @@
   if (this->bFire)
   {
-    std::cout << "fire..\n";
     weaponMan.fire();
   }