Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9996


Ignore:
Timestamp:
Mar 9, 2014, 10:34:08 PM (11 years ago)
Author:
noep
Message:

Fixed the method outputting the projectile's CollisionBox instead of the one of the Pawn it collides into.

Location:
code/branches/modularships
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/modularships/data/levels/emptyLevel.oxw

    r9995 r9996  
    4949    </MovableEntity>
    5050   
    51     <Pawn health=30 position="0,-50,0" direction="0,-1,0" collisionType=dynamic mass=1000 name=box radarname = "Box 4" >
     51    <Pawn health=30 position="0,-100,0" direction="0,0,0" collisionType=dynamic mass=1000 name=box radarname = "Box 4" >
    5252        <attached>
    5353            <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
     
    5555        <collisionShapes>
    5656            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
     57            <BoxCollisionShape position="0,-15,0" halfExtents="15,15,15" />
    5758        </collisionShapes>
    5859    </Pawn>
  • code/branches/modularships/src/orxonox/Scene.cc

    r9995 r9996  
    373373        bool modified = false;
    374374        if (object0->isCollisionCallbackActive())
    375             modified |= object0->customCollidesAgainst(object1, cs0, cp);
     375            modified |= object0->customCollidesAgainst(object1, cs1, cp);
    376376        if (object1->isCollisionCallbackActive())
    377             modified |= object1->customCollidesAgainst(object0, cs1, cp);
     377            modified |= object1->customCollidesAgainst(object0, cs0, cp);
    378378
    379379        return modified;
  • code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc

    r9995 r9996  
    280280            damage *= originator->getDamageMultiplier();
    281281
    282         orxout() << "damage(): Custom collision detected on CS: " << cs << endl;
     282        orxout() << "damage(): Custom collision detected on " << this->getRadarName() << ", CS: " << cs << endl;
    283283
    284284        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
Note: See TracChangeset for help on using the changeset viewer.