Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 1, 2006, 4:40:34 PM (18 years ago)
Author:
patrick
Message:

trunk: merged network branche into trunk

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/space_ships/space_ship.h

    r6868 r6959  
    4747    void calculateVelocity(float time);
    4848
     49    void doCollideNetwork( float energy );
     50
    4951    // !! temporary !!
    5052    void ADDWEAPON();
    … …  
    8486    ParticleEmitter*      burstEmitter;
    8587    ParticleSystem*       burstSystem;
     88
     89    std::list<float>        networkCollisionList;
    8690};
    8791
Note: See TracChangeset for help on using the changeset viewer.