- Timestamp:
- Jan 17, 2016, 1:59:00 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3/src/orxonox/controllers/CommonController.cc
r11052 r11065 83 83 int team2 = entity2->getTeam(); 84 84 85 Controller* controller = 0;85 Controller* controller = nullptr; 86 86 if (entity1->getController()) 87 87 controller = entity1->getController(); … … 120 120 } 121 121 122 TeamBaseMatchBase* base = 0;122 TeamBaseMatchBase* base = nullptr; 123 123 base = orxonox_cast<TeamBaseMatchBase*>(entity1); 124 124 if (base) … … 154 154 } 155 155 156 DroneController* droneController = 0;156 DroneController* droneController = nullptr; 157 157 droneController = orxonox_cast<DroneController*>(entity1->getController()); 158 158 if (droneController && static_cast<ControllableEntity*>(droneController->getOwner()) == entity2)
Note: See TracChangeset
for help on using the changeset viewer.