Context Navigation

← Previous Change
Next Change →

world_entities

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

Files:

: 50 edited

creatures/md2_creature.cc (modified) (1 diff)
creatures/md2_creature.h (modified) (1 diff)
environment.cc (modified) (1 diff)
environment.h (modified) (1 diff)
npcs/ground_turret.cc (modified) (1 diff)
npcs/ground_turret.h (modified) (1 diff)
power_ups/laser_power_up.cc (modified) (1 diff)
power_ups/laser_power_up.h (modified) (2 diffs)
power_ups/param_power_up.cc (modified) (1 diff)
power_ups/param_power_up.h (modified) (1 diff)
power_ups/power_up.cc (modified) (1 diff)
power_ups/power_up.h (modified) (1 diff)
power_ups/turret_power_up.cc (modified) (1 diff)
power_ups/turret_power_up.h (modified) (2 diffs)
power_ups/weapon_power_up.cc (modified) (1 diff)
power_ups/weapon_power_up.h (modified) (2 diffs)
projectiles/bomb.cc (modified) (1 diff)
projectiles/bomb.h (modified) (1 diff)
skybox.cc (modified) (1 diff)
skybox.h (modified) (1 diff)
space_ships/helicopter.cc (modified) (1 diff)
space_ships/helicopter.h (modified) (1 diff)
space_ships/space_ship.cc (modified) (1 diff)
space_ships/space_ship.h (modified) (1 diff)
spawning_point.cc (modified) (1 diff)
spawning_point.h (modified) (1 diff)
terrain.cc (modified) (1 diff)
terrain.h (modified) (1 diff)
test_entity.cc (modified) (1 diff)
test_entity.h (modified) (1 diff)
weapons/aim.cc (modified) (1 diff)
weapons/aim.h (modified) (1 diff)
weapons/aiming_turret.cc (modified) (1 diff)
weapons/aiming_turret.h (modified) (1 diff)
weapons/cannon.cc (modified) (1 diff)
weapons/cannon.h (modified) (1 diff)
weapons/crosshair.cc (modified) (1 diff)
weapons/crosshair.h (modified) (1 diff)
weapons/targeting_turret.cc (modified) (1 diff)
weapons/targeting_turret.h (modified) (1 diff)
weapons/test_gun.cc (modified) (1 diff)
weapons/test_gun.h (modified) (1 diff)
weapons/turret.cc (modified) (1 diff)
weapons/turret.h (modified) (1 diff)
weapons/weapon.cc (modified) (1 diff)
weapons/weapon.h (modified) (1 diff)
weapons/weapon_manager.cc (modified) (1 diff)
weapons/weapon_manager.h (modified) (1 diff)
world_entity.cc (modified) (1 diff)
world_entity.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/world_entities/creatures/md2_creature.cc

r6281	r6512
205	205	void MD2Creature::loadParams(const TiXmlElement* root)
206	206	{
207		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	207	WorldEntity::loadParams(root);
208	208	}
209	209

trunk/src/world_entities/creatures/md2_creature.h

r6222	r6512
25	25
26	26	void init();
27		void loadParams(const TiXmlElement* root);
	27	virtual void loadParams(const TiXmlElement* root);
28	28
29	29	virtual void enter();

trunk/src/world_entities/environment.cc

r6142	r6512
71	71	void Environment::loadParams(const TiXmlElement* root)
72	72	{
73		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	73	WorldEntity::loadParams(root);
74	74	}
75	75

trunk/src/world_entities/environment.h

r5994	r6512
24	24
25	25	void init();
26		void loadParams(const TiXmlElement* root);
	26	virtual void loadParams(const TiXmlElement* root);
27	27
28	28

trunk/src/world_entities/npcs/ground_turret.cc

r6439	r6512
76	76	{
77	77	// all the clases this Entity is directly derived from must be called in this way, to load all settings.
78		~~static_cast<NPC*>(this)->~~loadParams(root);
	78	NPC::loadParams(root);
79	79
80	80

trunk/src/world_entities/npcs/ground_turret.h

r6432	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 postSpawn ();

trunk/src/world_entities/power_ups/laser_power_up.cc

r6424	r6512
65	65	void LaserPowerUp::loadParams(const TiXmlElement* root)
66	66	{
67		~~static_cast<PowerUp*>(this)->~~loadParams(root);
	67	PowerUp::loadParams(root);
68	68
69	69	}

trunk/src/world_entities/power_ups/laser_power_up.h

-                      r6424
+                      r6512
   virtual ~LaserPowerUp ();
+  virtual void loadParams(const TiXmlElement* root);
   virtual void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
 …
   private:
    void init();
-   void loadParams(const TiXmlElement* root);
   private:

trunk/src/world_entities/power_ups/param_power_up.cc

r6498	r6512
63	63	void ParamPowerUp::loadParams(const TiXmlElement* root)
64	64	{
65		~~static_cast<PowerUp*>(this)->~~loadParams(root);
	65	PowerUp::loadParams(root);
66	66	LoadParam(root, "type", this, ParamPowerUp, setType);
67	67

trunk/src/world_entities/power_ups/param_power_up.h

r6424	r6512
38	38	private:
39	39	void init();
40		void loadParams(const TiXmlElement* root);
	40	virtual void loadParams(const TiXmlElement* root);
41	41
42	42	private:

trunk/src/world_entities/power_ups/power_up.cc

r6498	r6512
48	48	void PowerUp::loadParams(const TiXmlElement* root)
49	49	{
50		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	50	WorldEntity::loadParams(root);
51	51	}
52	52

trunk/src/world_entities/power_ups/power_up.h

r6424	r6512
20	20
21	21	public:
22		void loadParams(const TiXmlElement* root);
	22	virtual void loadParams(const TiXmlElement* root);
23	23	void collidesWith (WorldEntity* entity, const Vector& location);
24	24

trunk/src/world_entities/power_ups/turret_power_up.cc

r6498	r6512
65	65	void TurretPowerUp::loadParams(const TiXmlElement* root)
66	66	{
67		~~static_cast<PowerUp*>(this)->~~loadParams(root);
	67	PowerUp::loadParams(root);
68	68
69	69	}

trunk/src/world_entities/power_ups/turret_power_up.h

-                      r6424
+                      r6512
   virtual ~TurretPowerUp ();
+  virtual void loadParams(const TiXmlElement* root);
   virtual void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
 …
   private:
    void init();
-   void loadParams(const TiXmlElement* root);
   private:

trunk/src/world_entities/power_ups/weapon_power_up.cc

r6424	r6512
57	57	void WeaponPowerUp::loadParams(const TiXmlElement* root)
58	58	{
59		~~static_cast<PowerUp*>(this)->~~loadParams(root);
	59	PowerUp::loadParams(root);
60	60	const TiXmlElement* elem = root->FirstChildElement("weapon");
61	61	if(elem != NULL && (elem = elem->FirstChildElement()) != NULL)

trunk/src/world_entities/power_ups/weapon_power_up.h

-                      r6424
+                      r6512
   virtual ~WeaponPowerUp ();
+  virtual void loadParams(const TiXmlElement* root);
   Weapon* getWeapon();
   void setWeaponClass(const char* name);
 …
 private:
   void init();
-  void loadParams(const TiXmlElement* root);
 private:
   Weapon* weapon;

trunk/src/world_entities/projectiles/bomb.cc

r6434	r6512
96	96	{
97	97	// all the clases this Entity is directly derived from must be called in this way, to load all settings.
98		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	98	Projectile::loadParams(root);
99	99
100	100

trunk/src/world_entities/projectiles/bomb.h

r6434	r6512
22	22	virtual ~Bomb();
23	23
24		void loadParams(const TiXmlElement* root);
	24	virtual void loadParams(const TiXmlElement* root);
25	25	void init();
26	26

trunk/src/world_entities/skybox.cc

r6498	r6512
58	58	void SkyBox::loadParams(const TiXmlElement* root)
59	59	{
60		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	60	WorldEntity::loadParams(root);
61	61
62	62	LoadParam(root, "Materialset", this, SkyBox, setTexture)

trunk/src/world_entities/skybox.h

r6470	r6512
29	29	void preInit();
30	30
31		void loadParams(const TiXmlElement* root);
	31	virtual void loadParams(const TiXmlElement* root);
32	32
33	33	void postInit();

trunk/src/world_entities/space_ships/helicopter.cc

r6443	r6512
190	190	void Helicopter::loadParams(const TiXmlElement* root)
191	191	{
192		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	192	WorldEntity::loadParams(root);
193	193	}
194	194

trunk/src/world_entities/space_ships/helicopter.h

r6443	r6512
22	22
23	23	void init();
24		void loadParams(const TiXmlElement* root);
	24	virtual void loadParams(const TiXmlElement* root);
25	25
26	26	virtual void enter();

trunk/src/world_entities/space_ships/space_ship.cc

r6498	r6512
205	205	void SpaceShip::loadParams(const TiXmlElement* root)
206	206	{
207		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	207	WorldEntity::loadParams(root);
208	208	}
209	209

trunk/src/world_entities/space_ships/space_ship.h

r6443	r6512
26	26
27	27	void init();
28		void loadParams(const TiXmlElement* root);
	28	virtual void loadParams(const TiXmlElement* root);
29	29
30	30	virtual void enter();

trunk/src/world_entities/spawning_point.cc

r6424	r6512
71	71	{
72	72	/* let the world entity its stuff first */
73		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	73	WorldEntity::loadParams(root);
74	74
75	75	/* now load the frequency */

trunk/src/world_entities/spawning_point.h

r6139	r6512
22	22	void init();
23	23
24		void loadParams(const TiXmlElement* root);
	24	virtual void loadParams(const TiXmlElement* root);
25	25
26	26	/** sets the entity that is going to be spawned by this point @param classID: the id from the class_id.h file */

trunk/src/world_entities/terrain.cc

r6341	r6512
105	105	void Terrain::loadParams(const TiXmlElement* root)
106	106	{
107		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	107	WorldEntity::loadParams(root);
108	108
109	109	LoadParam(root, "vegetation", this, Terrain, loadVegetation)

trunk/src/world_entities/terrain.h

r6341	r6512
36	36
37	37	void init();
38		void loadParams(const TiXmlElement* root);
	38	virtual void loadParams(const TiXmlElement* root);
39	39
40	40	void loadVegetation(const char* vegetationFile);

trunk/src/world_entities/test_entity.cc

r6281	r6512
67	67	void TestEntity::loadParams(const TiXmlElement* root)
68	68	{
69		~~static_cast<WorldEntity*>(this)->~~loadParams(root);
	69	WorldEntity::loadParams(root);
70	70
71	71	LoadParam(root, "md2animation", this, TestEntity, setAnim)

trunk/src/world_entities/test_entity.h

r6281	r6512
22	22
23	23	void init();
24		void loadParams(const TiXmlElement* root);
	24	virtual void loadParams(const TiXmlElement* root);
25	25
26	26	void setAnim(int animationIndex);

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

trunk/src/world_entities/world_entity.cc

r6498	r6512
92	92	{
93	93	// Do the PNode loading stuff
94		~~static_cast<PNode*>(this)->~~loadParams(root);
	94	PNode::loadParams(root);
95	95
96	96	LoadParam(root, "md2texture", this, WorldEntity, loadMD2Texture)

trunk/src/world_entities/world_entity.h

r6498	r6512
34	34	virtual ~WorldEntity ();
35	35
36		void loadParams(const TiXmlElement* root);
	36	virtual void loadParams(const TiXmlElement* root);
37	37
38	38	void loadModel(const char* fileName, float scaling = 1.0f, unsigned int modelNumber = 0);

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

Context Navigation

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

Legend:

Download in other formats: