Changeset 8894 in orxonox.OLD for trunk/src/world_entities/world_entity.cc
- Timestamp:
- Jun 29, 2006, 12:19:48 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/world_entity.cc
r8778 r8894 193 193 PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str()); 194 194 195 if( modelNumber == 0 )195 if( modelNumber == 0 && !this->isA(CL_WEAPON)) 196 196 this->buildObbTree(obbTreeDepth); 197 197 } … … 418 418 CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject(); 419 419 assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h 420 c->collide( entityA, entityB, bvA, bvB);420 c->collide(COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB); 421 421 422 422 for( int i = 0; i < CREngine::CR_NUMBER; ++i) … … 433 433 * @param position it collides on the plane 434 434 */ 435 bool WorldEntity::registerCollision( WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position)435 bool WorldEntity::registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall) 436 436 { 437 437 // is there any handler listening? … … 442 442 CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject(); 443 443 assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h 444 c->collide( entity, groundEntity, normal, position);444 c->collide(type, entity, groundEntity, normal, position, bInWall); 445 445 446 446 for( int i = 0; i < CREngine::CR_NUMBER; ++i)
Note: See TracChangeset
for help on using the changeset viewer.