Changeset 5049 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Aug 16, 2005, 9:47:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some weapon-specifics

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/npc.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -439 +439 @@
   {
     WorldEntity* tmp = new NPC();
+    char npcChar[10];
+    sprintf (npcChar, "NPC_%d", i);
+    tmp->setName(npcChar);
     tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *100);
     this->spawn(tmp);

orxonox/trunk/src/world_entities/npc.cc

@@ -43 +43 @@
 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
+  PRINTF(0)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
 }
 

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -120 +120 @@
   this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->setStateDuration(WS_SHOOTING, .1);
-  this->setStateDuration(WS_RELOADING, 1);
+  this->setStateDuration(WS_SHOOTING, .3);
+  this->setStateDuration(WS_RELOADING, .5);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -82 +82 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setStateDuration(WS_SHOOTING, .4);
-  this->setStateDuration(WS_RELOADING, 2);
+  this->setStateDuration(WS_SHOOTING, .2);
+  this->setStateDuration(WS_RELOADING, .5);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);