Context Navigation

Changeset 3325 for code/trunk/src/orxonox/overlays/hud

Timestamp:

Jul 19, 2009, 3:48:00 PM (15 years ago)

Author:

rgrieder

Message:

Merged orxonox_cast related revisions from core4 back to trunk.

Location:

code/trunk

Files:

code/trunk
- Property svn:mergeinfo changed
  /code/branches/core4 merged: 3222-3224,3238

r3110	r3325
56	56	SUPER(AnnounceMessage, changedOwner);
57	57
58		this->owner_ = ~~dynamic~~_cast<PlayerInfo*>(this->getOwner());
	58	this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
59	59	}
60	60	}

r3110	r3325
56	56	SUPER(DeathMessage, changedOwner);
57	57
58		this->owner_ = ~~dynamic~~_cast<PlayerInfo*>(this->getOwner());
	58	this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
59	59	}
60	60	}

r3300	r3325
86	86	SUPER(GametypeStatus, changedOwner);
87	87
88		this->owner_ = ~~dynamic~~_cast<PlayerInfo*>(this->getOwner());
	88	this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
89	89	}
90	90	}

r3300	r3325
94	94	SUPER(HUDHealthBar, changedOwner);
95	95
96		this->owner_ = ~~dynamic~~_cast<Pawn*>(this->getOwner());
	96	this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
97	97	}
98	98

r3280	r3325
164	164	SUPER(HUDRadar, changedOwner);
165	165
166		this->owner_ = ~~dynamic~~_cast<Pawn*>(this->getOwner());
	166	this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
167	167	}
168	168	}

r3196	r3325
65	65	SUPER(HUDSpeedBar, changedOwner);
66	66
67		this->owner_ = ~~dynamic~~_cast<SpaceShip*>(this->getOwner());
	67	this->owner_ = orxonox_cast<SpaceShip*>(this->getOwner());
68	68	}
69	69	}

r3300	r3325
68	68	SUPER(HUDTimer, changedOwner);
69	69
70		this->owner_ = ~~dynamic~~_cast<ControllableEntity*>(this->getOwner());
	70	this->owner_ = orxonox_cast<ControllableEntity*>(this->getOwner());
71	71	}
72	72	}

r3110	r3325
56	56	SUPER(KillMessage, changedOwner);
57	57
58		this->owner_ = ~~dynamic~~_cast<PlayerInfo*>(this->getOwner());
	58	this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
59	59	}
60	60	}

r3280	r3325
133	133
134	134	if (this->getOwner() && this->getOwner()->getGametype())
135		this->owner_ = ~~dynamic~~_cast<Pong*>(this->getOwner()->getGametype());
	135	this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype());
136	136	else
137	137	this->owner_ = 0;

r3280	r3325
118	118
119	119	if (this->getOwner() && this->getOwner()->getGametype())
120		this->owner_ = ~~dynamic~~_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
	120	this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
121	121	else
122	122	this->owner_ = 0;

-                      r3196
+                      r3325
         SUPER(UnderAttackHealthBar, changedOwner);
         PlayerInfo* player = dynamic_cast<PlayerInfo*>(this->getOwner());
+        PlayerInfo* player = orxonox_cast<PlayerInfo*>(this->getOwner());
         if (player)
+        {
             this->owner_ = player;
             UnderAttack* ua = dynamic_cast<UnderAttack*>(player->getGametype());
+            UnderAttack* ua = orxonox_cast<UnderAttack*>(player->getGametype());
             if (ua)
+            {

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