This commit is contained in:
parent
7bb3c7353e
commit
579cb15a9d
20 changed files with 71 additions and 71 deletions
|
@ -138,8 +138,8 @@ void CNpcBalloonBridgePlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
init( startPos );
|
||||
|
||||
|
@ -152,7 +152,7 @@ void CNpcBalloonBridgePlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
newYPos = (u16) *PntList;
|
||||
PntList++;
|
||||
|
||||
m_maxExtension = abs( ( newYPos << 4 ) - startPos.vy );
|
||||
m_maxExtension = abs( ( ( newYPos << 4 ) + 16 ) - startPos.vy );
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -73,8 +73,8 @@ void CNpcBranchPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
init( startPos );
|
||||
|
||||
|
|
|
@ -60,8 +60,8 @@ void CNpcBigWheelPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
if ( ThisPlatform->PointCount > 1 )
|
||||
{
|
||||
|
@ -71,8 +71,8 @@ void CNpcBigWheelPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR pivotPos;
|
||||
pivotPos.vx = newXPos << 4;
|
||||
pivotPos.vy = newYPos << 4;
|
||||
pivotPos.vx = ( newXPos << 4 ) + 8;
|
||||
pivotPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
s32 xDist = startPos.vx - pivotPos.vx;
|
||||
s32 yDist = startPos.vy - pivotPos.vy;
|
||||
|
|
|
@ -64,8 +64,8 @@ void CNpcDualPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
init( startPos );
|
||||
|
||||
|
@ -78,7 +78,7 @@ void CNpcDualPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
newYPos = (u16) *PntList;
|
||||
PntList++;
|
||||
|
||||
m_maxExtension = ( newYPos << 4 ) - startPos.vy;
|
||||
m_maxExtension = ( ( newYPos << 4 ) + 16 ) - startPos.vy;
|
||||
|
||||
ASSERT( m_maxExtension >= 0 );
|
||||
|
||||
|
@ -90,7 +90,7 @@ void CNpcDualPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR slavePos;
|
||||
slavePos.vx = newXPos << 4;
|
||||
slavePos.vx = ( newXPos << 4 ) + 8;
|
||||
slavePos.vy = startPos.vy + m_maxExtension;
|
||||
|
||||
m_otherPlatform->init( slavePos );
|
||||
|
|
|
@ -45,8 +45,8 @@ void CNpcLanternPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
if ( ThisPlatform->PointCount > 1 )
|
||||
{
|
||||
|
@ -56,8 +56,8 @@ void CNpcLanternPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR pivotPos;
|
||||
pivotPos.vx = newXPos << 4;
|
||||
pivotPos.vy = newYPos << 4;
|
||||
pivotPos.vx = ( newXPos << 4 ) + 8;
|
||||
pivotPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
s32 xDist = startPos.vx - pivotPos.vx;
|
||||
s32 yDist = startPos.vy - pivotPos.vy;
|
||||
|
|
|
@ -460,8 +460,8 @@ void CNpcPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
init( startPos );
|
||||
|
||||
|
|
|
@ -62,8 +62,8 @@ void CNpcPendulumPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
if ( ThisPlatform->PointCount > 1 )
|
||||
{
|
||||
|
@ -73,8 +73,8 @@ void CNpcPendulumPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR pivotPos;
|
||||
pivotPos.vx = newXPos << 4;
|
||||
pivotPos.vy = newYPos << 4;
|
||||
pivotPos.vx = ( newXPos << 4 ) + 8;
|
||||
pivotPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
s32 xDist = startPos.vx - pivotPos.vx;
|
||||
s32 yDist = startPos.vy - pivotPos.vy;
|
||||
|
|
|
@ -60,8 +60,8 @@ void CNpcRisingBridgePlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
init( startPos );
|
||||
|
||||
|
@ -74,7 +74,7 @@ void CNpcRisingBridgePlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
newYPos = (u16) *PntList;
|
||||
PntList++;
|
||||
|
||||
m_maxExtension = abs( ( newYPos << 4 ) - startPos.vy ) << 8;
|
||||
m_maxExtension = abs( ( ( newYPos << 4 ) + 16 ) - startPos.vy ) << 8;
|
||||
|
||||
// get slave trigger position
|
||||
|
||||
|
@ -87,7 +87,7 @@ void CNpcRisingBridgePlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
|
||||
// trigger = new ("PlatformTrigger") CPlatformTrigger();
|
||||
trigger=(CPlatformTrigger*)CTrigger::Create(CTrigger::TRIGGER_PLATFORM);
|
||||
trigger->setPositionAndSize( newXPos << 4, newYPos << 4, 100, 0 );
|
||||
trigger->setPositionAndSize( ( newXPos << 4 ) + 8, ( newYPos << 4 ) + 16, 100, 0 );
|
||||
//trigger->setTargetBox(TriggerList->TargetPos.X<<4,TriggerList->TargetPos.Y<<4,TriggerList->TargetSize.X<<4,TriggerList->TargetSize.Y<<4);
|
||||
trigger->setPlatform( this );
|
||||
}
|
||||
|
|
|
@ -56,8 +56,8 @@ void CNpcTrapdoorPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
Pos = startPos;
|
||||
m_base = Pos;
|
||||
|
@ -71,7 +71,7 @@ void CNpcTrapdoorPlatform::setWaypoints( sThingPlatform *ThisPlatform )
|
|||
newYPos = (u16) *PntList;
|
||||
PntList++;
|
||||
|
||||
if ( ( newXPos << 4 ) > m_base.vx )
|
||||
if ( ( ( newXPos << 4 ) + 8 ) > m_base.vx )
|
||||
{
|
||||
m_pointRight = true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue