Changeset 10692 in orxonox.OLD for branches/vs-enhencements

Timestamp:

Jun 14, 2007, 12:50:56 PM (18 years ago)

Author:

nicolasc

Message:

xfer, WFM…

Location:

branches/vs-enhencements/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (4 diffs)
• weapons/weapon_manager.cc (modified) (1 diff)
• weapons/weapon_slot.cc (modified) (1 diff)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -179 +179 @@
 
 //   printf("done\nloading primary weapons...");
-  this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
-  this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
   this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
   this->weaponMan.addWeaponToSlot(0, 3, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
   this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
   this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
@@ -475 +475 @@
 {
 
-  printf( "loading WS..." );
+//   printf( "loading WS..." );
 
   if( !this->bInit)
   {
     // now get slots from the mount points
+//     printf("initializing... ");
     std::map<int, MountPoint*>::iterator it = this->mountPointMap.begin();
     for( ;it != this->mountPointMap.end(); it++)
@@ -492 +493 @@
 //         PRINTF(0)("setting slot %i\n", slot);
 //         (*it).second->getCenter().debug();
+//       printf("*");
       }
     }
   this->bInit = true;
   }
-  printf (" done\n");
+//   printf (" done\n");
 
   // Playable::tick(time);
@@ -853 +855 @@
         State::getCamera()->setEventHandling(false);
 
-        PRINTF(0)("\n\n\n\n\n\n\n\nSETCAMERA %x\n\n\n\n\n\n\n", State::getCamera());
+        PRINTF(0)("SETCAMERA %x", State::getCamera());
         State::getCamera()->setViewMode(Camera::ViewNormal);
         State::getCameraTargetNode()->setParent(this);

branches/vs-enhencements/src/world_entities/weapons/weapon_manager.cc

@@ -319 +319 @@
   this->slotConfigs[slotID]->setWeapon(weapon, configID);
   weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
-//   if(configID == this->currentConfigID)
-//     this->slotConfigs[slotID]->setNextWeapon(weapon);
+  if(configID == this->currentConfigID)
+    this->slotConfigs[slotID]->setNextWeapon(configID);
   //if (this->parent != NULL)
   {

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.cc

@@ -68 +68 @@
 
   LoadParam(root, "addWeapon", this, WeaponSlot, addWeapon)
-  .describe("create a new Weapon, and add it to config");
+  .describe("create a new Weapon, and add it to config")
+  .defaultValues("", 0);
 }