- Timestamp:
- Apr 18, 2009, 6:14:52 PM (15 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/gui/src/orxonox/objects/weaponSystem/weapons/Fusion.h merged eligible /code/branches/pickups/src/orxonox/objects/weaponSystem/weapons/Fusion.h merged eligible /code/branches/pickups2/src/orxonox/objects/weaponSystem/weapons/Fusion.h merged eligible /code/branches/weaponsystem/src/orxonox/objects/weaponSystem/weapons/Fusion.h merged eligible /code/branches/buildsystem/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2506-2658 /code/branches/buildsystem3/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2662-2708 /code/branches/ceguilua/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1802-1808 /code/branches/core3/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1572-1739 /code/branches/gcc43/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1580 /code/branches/input/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1629-1636 /code/branches/lodfinal/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2372-2411 /code/branches/miniprojects/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2754-2824 /code/branches/network/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2356 /code/branches/network64/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2210-2355 /code/branches/objecthierarchy/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2171-2479 /code/branches/overlay/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2117-2385 /code/branches/physics/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2436-2457 /code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1894-2088 /code/branches/questsystem2/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2107-2259 /code/branches/script_trigger/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1295-1953,1955 /code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/Fusion.h 1925-2094 /code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2107-2488
r2914 r2918 27 27 */ 28 28 29 #ifndef _Fusion _H__30 #define _Fusion _H__29 #ifndef _FusionFire_H__ 30 #define _FusionFire_H__ 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include "objects/weaponSystem/Weapon .h"33 #include "objects/weaponSystem/WeaponMode.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _OrxonoxExport Fusion : public Weapon37 class _OrxonoxExport FusionFire : public WeaponMode 38 38 { 39 39 public: 40 Fusion (BaseObject* creator);41 virtual ~Fusion ();40 FusionFire(BaseObject* creator); 41 virtual ~FusionFire() {} 42 42 43 virtual void takeBullets(); 44 virtual void takeMagazines(); 45 virtual void createProjectile(); 43 virtual void fire(); 46 44 47 45 private: 48 46 float speed_; 49 50 47 }; 51 48 } 52 49 53 #endif /* _Fusion _H__ */50 #endif /* _FusionFire_H__ */ -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.