Changeset 7064 for code/branches/presentation3
- Timestamp:
- May 31, 2010, 6:06:03 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
r7037 r7064 734 734 } 735 735 736 if (entity 1->getController())737 controller = entity 1->getController();736 if (entity2->getController()) 737 controller = entity2->getController(); 738 738 else 739 controller = entity 1->getXMLController();739 controller = entity2->getXMLController(); 740 740 if (controller) 741 741 {
Note: See TracChangeset
for help on using the changeset viewer.