Context Navigation

weaponSystem

Timestamp:

Nov 1, 2008, 10:27:12 PM (16 years ago)

Author:

landauf

Message:

adopted weapon classes to the new hierarchy (with a creator pointer)

Location:

code/trunk/src/orxonox/objects/weaponSystem

Files:

r2096	r2097
37	37	namespace orxonox
38	38	{
39		Munition::Munition()
	39	Munition::Munition(BaseObject* creator) : BaseObject(creator)
40	40	{
41	41	RegisterObject(Munition);

r2096	r2097
40	40	{
41	41	public:
42		Munition();
	42	Munition(BaseObject* creator);
43	43	virtual ~Munition();
44	44

r2096	r2097
37	37	namespace orxonox
38	38	{
39		Weapon::Weapon()
	39	Weapon::Weapon(BaseObject* creator) : BaseObject(creator)
40	40	{
41	41	RegisterObject(Weapon);
…	…
55	55
56	56	}
	57
	58	void Weapon::fire()
	59	{
	60
	61	}
57	62	}

r2096	r2097
38	38	namespace orxonox
39	39	{
40		WeaponSet::WeaponSet(~~int k~~)
	40	WeaponSet::WeaponSet(BaseObject* creator, int k) : BaseObject(creator)
41	41	{
42	42	RegisterObject(WeaponSet);
…	…
44	44	for (int i=0;i<k;i++)
45	45	{
46		this->wSlotNew = new WeaponSlot();
47		attachWeaponSlot(wSlotNew);
	46	attachWeaponSlot(new WeaponSlot(this));
48	47	}
49	48	}
…	…
69	68	}
70	69
71		WeaponSlot * getWeaponSlotPointer(int n)
	70	WeaponSlot * WeaponSet::getWeaponSlotPointer(int n)
72	71	{
73	72	return this->weaponSlots_[n];

r2096	r2097
43	43	{
44	44	public:
45		WeaponSet(~~int k~~);
	45	WeaponSet(BaseObject* creator, int k = 0);
46	46	virtual ~WeaponSet();
47	47

r2096	r2097
39	39	namespace orxonox
40	40	{
41		WeaponSlot::WeaponSlot()
	41	WeaponSlot::WeaponSlot(BaseObject* creator) : BaseObject(creator)
42	42	{
43	43	RegisterObject(WeaponSlot);

r2096	r2097
43	43	{
44	44	public:
45		WeaponSlot();
	45	WeaponSlot(BaseObject* creator);
46	46	virtual ~WeaponSlot();
47	47

r2096	r2097
37	37	namespace orxonox
38	38	{
39		LaserGunMunition::LaserGunMunition()
	39	LaserGunMunition::LaserGunMunition(BaseObject* creator) : BaseObject(creator)
40	40	{
41	41	RegisterObject(LaserGunMunition);

r2096	r2097
40	40	{
41	41	public:
42		LaserGunMunition();
	42	LaserGunMunition(BaseObject* creator);
43	43	virtual ~LaserGunMunition();
44	44

r2096	r2097
37	37	namespace orxonox
38	38	{
39		LaserGun::LaserGun()
	39	LaserGun::LaserGun(BaseObject* creator) : Weapon(creator)
40	40	{
41	41	RegisterObject(LaserGun);

-                      r2096
+                      r2097
 namespace orxonox
+{
     class _OrxonoxExport LaserGun : public BaseObject : public Weapon
+    class _OrxonoxExport LaserGun : public Weapon
+    {
         public:
             LaserGun();
+            LaserGun(BaseObject* creator);
             virtual ~LaserGun();

r2096	r2097
38	38	namespace orxonox
39	39	{
40		Missile::Missile()
	40	Missile::Missile(BaseObject* creator) : Weapon(creator)
41	41	{
42	42	RegisterObject(Missile);

Note: See TracChangeset for help on using the changeset viewer.