This commit is contained in:
parent
7bb3c7353e
commit
579cb15a9d
20 changed files with 71 additions and 71 deletions
|
@ -326,8 +326,8 @@ void CNpcHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
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;
|
||||
|
|
|
@ -249,8 +249,8 @@ void CNpcFallingHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
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;
|
||||
|
|
|
@ -56,8 +56,8 @@ void CNpcFireballHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
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;
|
||||
|
|
|
@ -47,8 +47,8 @@ void CNpcPendulumHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
PntList++;
|
||||
|
||||
DVECTOR startPos;
|
||||
startPos.vx = newXPos << 4;
|
||||
startPos.vy = newYPos << 4;
|
||||
startPos.vx = ( newXPos << 4 ) + 8;
|
||||
startPos.vy = ( newYPos << 4 ) + 16;
|
||||
|
||||
if ( ThisHazard->PointCount > 1 )
|
||||
{
|
||||
|
@ -58,8 +58,8 @@ void CNpcPendulumHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
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;
|
||||
|
|
|
@ -52,8 +52,8 @@ void CNpcPressureSwitchHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
m_triggerPos.vy = newYPos;
|
||||
|
||||
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;
|
||||
|
|
|
@ -47,8 +47,8 @@ void CNpcRisingWeightHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
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;
|
||||
|
@ -60,7 +60,7 @@ void CNpcRisingWeightHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
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
|
||||
|
||||
|
|
|
@ -49,8 +49,8 @@ void CNpcRisingWeightWheelHazard::setWaypoints( sThingHazard *ThisHazard )
|
|||
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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue