Changeset 2493 for code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.h
- Timestamp:
- Dec 17, 2008, 2:10:11 AM (15 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
/code/branches/weapon2 (added) merged: 2108,2145,2186,2203,2232,2272-2273,2288,2308,2319,2327,2331,2337,2347,2354,2366-2368,2379,2391,2393,2398,2410
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.h
r2099 r2493 42 42 virtual ~Projectile(); 43 43 void setConfigValues(); 44 void speedChanged();45 44 void destroyObject(); 46 45 virtual void tick(float dt); 47 46 48 virtual bool create();49 50 static float getSpeed()51 { return Projectile::speed_s; }52 53 47 protected: 54 Projectile(BaseObject* creator, Weapon* owner = 0); 55 SpaceShip* owner_; 48 Projectile(BaseObject* creator); 56 49 57 50 private: … … 59 52 std::string smokeTemplateName_; 60 53 protected: 61 static float speed_s;62 54 float speed_; 63 55 private:
Note: See TracChangeset
for help on using the changeset viewer.