Changeset 3223 for code/branches/core4/src/orxonox/objects/controllers
- Timestamp:
- Jun 23, 2009, 7:28:48 PM (15 years ago)
- Location:
- code/branches/core4/src/orxonox/objects/controllers
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core4/src/orxonox/objects/controllers/ArtificialController.cc
r3196 r3223 181 181 if (entity1->getXMLController()) 182 182 { 183 WaypointPatrolController* wpc = dynamic_cast<WaypointPatrolController*>(entity1->getXMLController());183 WaypointPatrolController* wpc = orxonox_cast<WaypointPatrolController>(entity1->getXMLController()); 184 184 if (wpc) 185 185 team1 = wpc->getTeam(); … … 187 187 if (entity2->getXMLController()) 188 188 { 189 WaypointPatrolController* wpc = dynamic_cast<WaypointPatrolController*>(entity2->getXMLController());189 WaypointPatrolController* wpc = orxonox_cast<WaypointPatrolController>(entity2->getXMLController()); 190 190 if (wpc) 191 191 team2 = wpc->getTeam(); 192 192 } 193 193 194 TeamDeathmatch* tdm = dynamic_cast<TeamDeathmatch*>(gametype);194 TeamDeathmatch* tdm = orxonox_cast<TeamDeathmatch>(gametype); 195 195 if (tdm) 196 196 { … … 203 203 204 204 TeamBaseMatchBase* base = 0; 205 base = dynamic_cast<TeamBaseMatchBase*>(entity1);205 base = orxonox_cast<TeamBaseMatchBase>(entity1); 206 206 if (base) 207 207 { … … 219 219 } 220 220 } 221 base = dynamic_cast<TeamBaseMatchBase*>(entity2);221 base = orxonox_cast<TeamBaseMatchBase>(entity2); 222 222 if (base) 223 223 { -
code/branches/core4/src/orxonox/objects/controllers/HumanController.cc
r3196 r3223 161 161 if (HumanController::localController_s && HumanController::localController_s->controllableEntity_) 162 162 { 163 Pawn* pawn = dynamic_cast<Pawn*>(HumanController::localController_s->controllableEntity_);163 Pawn* pawn = orxonox_cast<Pawn>(HumanController::localController_s->controllableEntity_); 164 164 if (pawn) 165 165 pawn->kill(); … … 196 196 { 197 197 if (HumanController::localController_s) 198 return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());198 return orxonox_cast<Pawn>(HumanController::localController_s->getControllableEntity()); 199 199 else 200 200 return NULL;
Note: See TracChangeset
for help on using the changeset viewer.