Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2049


Ignore:
Timestamp:
Oct 29, 2008, 2:40:02 PM (11 years ago)
Author:
polakma
Message:

Objekte erstellt.

Location:
code/branches/weapon/src/orxonox
Files:
19 added
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weapon/src/orxonox/CMakeLists.txt

    r1844 r2049  
    6363  objects/ParticleProjectile.cc
    6464
     65  objects/WeaponSystem.cc
     66  objects/weaponSystem/WeaponSet.cc
     67  objects/weaponSystem/WeaponSlot.cc
     68  objects/weaponSystem/Weapon.cc
     69  objects/weaponSystem/Munition.cc
     70
     71
    6572  tolua/tolua_bind.cc
    6673)
  • code/branches/weapon/src/orxonox/OrxonoxPrereqs.h

    r1755 r2049  
    9797    class ParticleProjectile;
    9898
     99    class WeaponSystem;
     100    class WeaponSet;
     101    class WeaponSlot;
     102    class Weapon;
     103    class Munition;
     104
    99105    // tools
    100106    class BillboardSet;
  • code/branches/weapon/src/orxonox/objects/SpaceShip.cc

    r1908 r2049  
    148148        for (ObjectList<SpaceShipAI>::iterator it = ObjectList<SpaceShipAI>::begin(); it; ++it)
    149149            it->shipDied(this);
    150      
     150
    151151        if (this->isInitialized())
    152152        {
     
    262262              this->backlight_->setPosition(-2.35, 0, 0.2);
    263263              this->backlight_->setColour(this->getProjectileColour());
    264  
     264
    265265              this->smoke_ = new ParticleSpawner();
    266266              this->smoke_->setParticle("Orxonox/smoke5", LODParticle::normal, 0, 0, 3);
    267267              this->attachObject(this->smoke_);
    268  
     268
    269269              this->fire_ = new ParticleSpawner();
    270270              this->fire_->setParticle("Orxonox/fire3", LODParticle::normal, 0, 0, 1);
    271271              this->attachObject(this->fire_);
    272272            }
    273            
     273
    274274            // END CREATING ADDITIONAL EFFECTS
    275275
     
    300300    void SpaceShip::setConfigValues()
    301301    {
    302         SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
     302        SetConfigValue(bInvertYAxis_, false).description("Set this to true for joys-like mouse behaviour (mouse up = ship down).");
    303303        SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
    304304        SetConfigValue(testvector_, Vector3()).description("asdfblah");
Note: See TracChangeset for help on using the changeset viewer.