Changeset 7932 in orxonox.OLD for branches/cr/src/world_entities
- Timestamp:
- May 28, 2006, 9:00:40 PM (19 years ago)
- Location:
- branches/cr/src/world_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/cr/src/world_entities/world_entity.cc
r7927 r7932 69 69 70 70 this->toList(OM_NULL); 71 72 //this->collisionHandles = new *CollisionHandle[CREngine::CR_NUMBER]();73 71 } 74 72 … … 242 240 */ 243 241 void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, ...) 244 {} 242 { 243 244 this->collisionHandles[type] = CREngine::getInstance()->subscribeReaction(this, type); 245 246 va_list itemlist; 247 va_start (itemlist, CREngine::CRType); 248 for (int i = 0; i < nrOfTargets; i++) 249 this->collisionHandles[type].push_back(va_arg(itemlist, long)); 250 va_end(itemlist); 251 } 245 252 246 253 -
branches/cr/src/world_entities/world_entity.h
r7927 r7932 130 130 bool bVisible; //!< If it should be visible. 131 131 132 OM_LIST objectListNumber; //!< The ObjectList from ObjectManager this Entity is in.133 ObjectManager::EntityList::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.132 OM_LIST objectListNumber; //!< The ObjectList from ObjectManager this Entity is in. 133 ObjectManager::EntityList::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager. 134 134 135 float scaling; 136 CollisionHandle* * collisionHandles;135 float scaling; //!< the scaling of the model 136 CollisionHandle* collisionHandles[CREngine::CR_NUMBER]; //!< the list of the collision reactions 137 137 138 138
Note: See TracChangeset
for help on using the changeset viewer.