Changeset 9186 in orxonox.OLD for branches/presentation/src/world_entities

Timestamp:

Jul 5, 2006, 7:21:25 AM (18 years ago)

Author:

patrick

Message:

muchos debugos inofromationos

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (3 diffs)
• npcs/generic_npc.cc (modified) (1 diff)
• weapons/aiming_system.cc (modified) (3 diffs)
• weapons/aiming_system.h (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -140 +140 @@
 
   this->getWeaponManager().setParentNode(&this->cameraNode);
-  this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
   this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
 
@@ -239 +238 @@
 
       State::getCameraNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
+      this->cameraNode.setParentMode(PNODE_ROTATE_AND_MOVE);
+      this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
 
 
@@ -244 +245 @@
       this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
 
-      this->aimingSystem->toList(/*OM_LIST(this->getOMListNumber() + 1)*/ OM_COMMON);
+      this->aimingSystem->toList(/*OM_LIST(this->getOMListNumber() + 1)*/ OM_GROUP_01);
     }
   }

branches/presentation/src/world_entities/npcs/generic_npc.cc

@@ -82 +82 @@
 {
   this->setClassID(CL_GENERIC_NPC, "GenericNPC");
+
   this->toList(OM_GROUP_00);
 

branches/presentation/src/world_entities/weapons/aiming_system.cc

@@ -35 +35 @@
  */
 AimingSystem::AimingSystem (WorldEntity* entity)
+  : WorldEntity()
 {
   this->owner = entity;
@@ -61 +62 @@
 
   // registering default reactions:
+  this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
@@ -120 +122 @@
 
   PRINTF(0)("hit hit hit, got: %s\n", killer->getClassName());
+  printf("aimingsystem: hit()\n");
 }
 

branches/presentation/src/world_entities/weapons/aiming_system.h

@@ -33 +33 @@
   void setRange(float range){this->range = range;};
 
-  void hit(float damage, WorldEntity* killer);
+  virtual void hit(float damage, WorldEntity* killer);
+  virtual void destroy(WorldEntity* entity) {}
 
   virtual void tick(float dt);

branches/presentation/src/world_entities/world_entity.cc

@@ -414 +414 @@
 bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
 {
+  PRINTF(5)("registering collision of type: %s vs %s\n", entityA->getClassName(), entityB->getClassName());
   // is there any handler listening?
   if( !this->bReactive)