Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10692 in orxonox.OLD


Ignore:
Timestamp:
Jun 14, 2007, 12:50:56 PM (17 years ago)
Author:
nicolasc
Message:

xfer, WFM…

Location:
branches/vs-enhencements/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

    r10691 r10692  
    179179
    180180//   printf("done\nloading primary weapons...");
    181   this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
    182   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
     181//   this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
     182//   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
    183183  this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
    184184  this->weaponMan.addWeaponToSlot(0, 3, "RFCannon");
    185   this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
    186   this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
     185//   this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
     186//   this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
    187187  this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
    188188  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
     
    475475{
    476476
    477   printf( "loading WS..." );
     477//   printf( "loading WS..." );
    478478
    479479  if( !this->bInit)
    480480  {
    481481    // now get slots from the mount points
     482//     printf("initializing... ");
    482483    std::map<int, MountPoint*>::iterator it = this->mountPointMap.begin();
    483484    for( ;it != this->mountPointMap.end(); it++)
     
    492493//         PRINTF(0)("setting slot %i\n", slot);
    493494//         (*it).second->getCenter().debug();
     495//       printf("*");
    494496      }
    495497    }
    496498  this->bInit = true;
    497499  }
    498   printf (" done\n");
     500//   printf (" done\n");
    499501
    500502  // Playable::tick(time);
     
    853855        State::getCamera()->setEventHandling(false);
    854856
    855         PRINTF(0)("\n\n\n\n\n\n\n\nSETCAMERA %x\n\n\n\n\n\n\n", State::getCamera());
     857        PRINTF(0)("SETCAMERA %x", State::getCamera());
    856858        State::getCamera()->setViewMode(Camera::ViewNormal);
    857859        State::getCameraTargetNode()->setParent(this);
  • branches/vs-enhencements/src/world_entities/weapons/weapon_manager.cc

    r10678 r10692  
    319319  this->slotConfigs[slotID]->setWeapon(weapon, configID);
    320320  weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
    321 //   if(configID == this->currentConfigID)
    322 //     this->slotConfigs[slotID]->setNextWeapon(weapon);
     321  if(configID == this->currentConfigID)
     322    this->slotConfigs[slotID]->setNextWeapon(configID);
    323323  //if (this->parent != NULL)
    324324  {
  • branches/vs-enhencements/src/world_entities/weapons/weapon_slot.cc

    r10676 r10692  
    6868
    6969  LoadParam(root, "addWeapon", this, WeaponSlot, addWeapon)
    70   .describe("create a new Weapon, and add it to config");
     70  .describe("create a new Weapon, and add it to config")
     71  .defaultValues("", 0);
    7172}
    7273
Note: See TracChangeset for help on using the changeset viewer.