Context Navigation

← Previous Change
Next Change →

weapons

Timestamp:

Jan 17, 2006, 10:01:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loadParams is now virtual.
ALL THE CLASSES HAVE TO CALL

SuperClass::loadParams(root);

isntead of:
static_cast<SuperClass*>(this)→loadParams(root);

which was quite stupid anyways

Location:

trunk/src/world_entities/weapons

Files:

: 18 edited

aim.cc (modified) (1 diff)
aim.h (modified) (1 diff)
aiming_turret.cc (modified) (1 diff)
aiming_turret.h (modified) (1 diff)
cannon.cc (modified) (1 diff)
cannon.h (modified) (1 diff)
crosshair.cc (modified) (1 diff)
crosshair.h (modified) (1 diff)
targeting_turret.cc (modified) (1 diff)
targeting_turret.h (modified) (1 diff)
test_gun.cc (modified) (1 diff)
test_gun.h (modified) (1 diff)
turret.cc (modified) (1 diff)
turret.h (modified) (1 diff)
weapon.cc (modified) (1 diff)
weapon.h (modified) (1 diff)
weapon_manager.cc (modified) (1 diff)
weapon_manager.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/world_entities/weapons/aim.cc

r6305	r6512
89	89	void Aim::loadParams(const TiXmlElement* root)
90	90	{
91		~~static_cast<PNode*>(this)->~~loadParams(root);
	91	PNode::loadParams(root);
92	92
93	93	LoadParam(root, "texture", this, Aim, setTexture)

trunk/src/world_entities/weapons/aim.h

r5750	r6512
31	31
32	32	void init();
33		void loadParams(const TiXmlElement* root);
	33	virtual void loadParams(const TiXmlElement* root);
34	34
35	35	inline void setSource(PNode* source) { this->source = source; };

trunk/src/world_entities/weapons/aiming_turret.cc

r6439	r6512
102	102	void AimingTurret::loadParams(const TiXmlElement* root)
103	103	{
104		~~static_cast<Weapon*>(this)->~~loadParams(root);
	104	Weapon::loadParams(root);
105	105
106	106	}

trunk/src/world_entities/weapons/aiming_turret.h

r5750	r6512
20	20
21	21	void init();
22		void loadParams(const TiXmlElement* root);
	22	virtual void loadParams(const TiXmlElement* root);
23	23
24	24	virtual void activate();

trunk/src/world_entities/weapons/cannon.cc

r6434	r6512
118	118	void Cannon::loadParams(const TiXmlElement* root)
119	119	{
120
121
	120	Weapon::loadParams(root);
122	121	}
123	122

trunk/src/world_entities/weapons/cannon.h

r5750	r6512
18	18
19	19	void init();
20		void loadParams(const TiXmlElement* root);
	20	virtual void loadParams(const TiXmlElement* root);
21	21
22	22	virtual void activate();

trunk/src/world_entities/weapons/crosshair.cc

-                      r6162
+                      r6512
 void Crosshair::loadParams(const TiXmlElement* root)
+{
   static_cast<PNode*>(this)->loadParams(root);
   static_cast<EventListener*>(this)->loadParams(root);
+  PNode::loadParams(root);
+  EventListener::loadParams(root);
   LoadParam(root, "texture", this, Crosshair, setTexture)

trunk/src/world_entities/weapons/crosshair.h

r5405	r6512
28	28
29	29	void init();
30		void loadParams(const TiXmlElement* root);
	30	virtual void loadParams(const TiXmlElement* root);
31	31
32	32	void setSize(float size);

trunk/src/world_entities/weapons/targeting_turret.cc

r6439	r6512
103	103	void TargetingTurret::loadParams(const TiXmlElement* root)
104	104	{
105		~~static_cast<Weapon*>(this)->~~loadParams(root);
	105	Weapon::loadParams(root);
106	106
107	107	}

trunk/src/world_entities/weapons/targeting_turret.h

r6426	r6512
20	20
21	21	void init();
22		void loadParams(const TiXmlElement* root);
	22	virtual void loadParams(const TiXmlElement* root);
23	23
24	24	virtual void activate();

trunk/src/world_entities/weapons/test_gun.cc

r6434	r6512
139	139	void TestGun::loadParams(const TiXmlElement* root)
140	140	{
141
	141	Weapon::loadParams(root);
142	142
143	143	}

trunk/src/world_entities/weapons/test_gun.h

r5750	r6512
43	43
44	44	void init();
45		void loadParams(const TiXmlElement* root);
	45	virtual void loadParams(const TiXmlElement* root);
46	46
47	47	virtual void activate();

trunk/src/world_entities/weapons/turret.cc

r6439	r6512
100	100	void Turret::loadParams(const TiXmlElement* root)
101	101	{
102		~~static_cast<Weapon*>(this)->~~loadParams(root);
	102	Weapon::loadParams(root);
103	103
104	104	}

trunk/src/world_entities/weapons/turret.h

r6438	r6512
17	17
18	18	void init();
19		void loadParams(const TiXmlElement* root);
	19	virtual void loadParams(const TiXmlElement* root);
20	20
21	21	virtual void activate();

trunk/src/world_entities/weapons/weapon.cc

r6445	r6512
111	111	void Weapon::loadParams(const TiXmlElement* root)
112	112	{
113		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	113	WorldEntity::loadParams(root);
114	114
115	115	LoadParam(root, "projectile", this, Weapon, setProjectileType)

trunk/src/world_entities/weapons/weapon.h

r6445	r6512
86	86
87	87	void init();
88		void loadParams(const TiXmlElement* root);
	88	virtual void loadParams(const TiXmlElement* root);
89	89	////////////////////
90	90

trunk/src/world_entities/weapons/weapon_manager.cc

r6439	r6512
116	116	void WeaponManager::loadParams(const TiXmlElement* root)
117	117	{
118		~~static_cast<BaseObject*>(this)->~~loadParams(root);
	118	BaseObject::loadParams(root);
119	119
120	120	LoadParam(root, "slot-count", this, WeaponManager, setSlotCount)

trunk/src/world_entities/weapons/weapon_manager.h

r6444	r6512
53	53
54	54	void init();
55		void loadParams(const TiXmlElement* root);
	55	virtual void loadParams(const TiXmlElement* root);
56	56	void loadWeapons(const TiXmlElement* root);
57	57

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

Context Navigation

Changeset 6512 in orxonox.OLD for trunk/src/world_entities/weapons

Legend:

Download in other formats: