This commit is contained in:
Daveo 2001-07-23 19:26:37 +00:00
parent 1da64afa81
commit c7fe8c740b
70 changed files with 302 additions and 445 deletions

View file

@ -76,7 +76,7 @@ void CNpcBouncingBarrelHazard::processMovement( int _frames )
m_rotation += 64 * _frames;
m_rotation &= 4095;
DVECTOR offset = CLevel::getCameraPos();
DVECTOR const &offset = CLevel::getCameraPos();
s32 yPos = Pos.vy - offset.vy;

View file

@ -75,7 +75,7 @@ void CNpcCheckpointHazard::render()
{
int x,y;
DVECTOR offset = CLevel::getCameraPos();
DVECTOR const &offset = CLevel::getCameraPos();
int spriteWidth = CGameScene::getSpriteBank()->getFrameWidth(m_spriteFrame);
int spriteHeight = CGameScene::getSpriteBank()->getFrameHeight(m_spriteFrame);
@ -101,7 +101,7 @@ void CNpcCheckpointHazard::collidedWith(CThing *_thisThing)
{
case TYPE_PLAYER:
{
CRECT collisionArea=getCollisionArea();
CRECT const &collisionArea=getCollisionArea();
DVECTOR respawnPos;
respawnPos.vx=collisionArea.x1+((collisionArea.x2-collisionArea.x1)/2);
respawnPos.vy=collisionArea.y2;

View file

@ -156,7 +156,7 @@ void CNpcFallingHazard::processMovement( int _frames )
}
}
DVECTOR offset = CLevel::getCameraPos();
DVECTOR const &offset = CLevel::getCameraPos();
s32 yPos = Pos.vy - offset.vy;

View file

@ -123,7 +123,7 @@ void CNpcFlyTrapHazard::render()
scale.vy = ONE;
scale.vz = ONE;
m_modelGfx->Render(renderPos,&rotation,&scale);
m_modelGfx->RenderClip(renderPos,&rotation,&scale);
sBBox boundingBox = m_modelGfx->GetBBox();

View file

@ -130,7 +130,7 @@ void CNpcPendulumHazard::render()
int x1,y1,x2,y2;
int minX, maxX, minY, maxY;
DVECTOR offset = CLevel::getCameraPos();
DVECTOR const &offset = CLevel::getCameraPos();
CHazardThing::render();

View file

@ -93,7 +93,7 @@ void CNpcRockShardHazard::processMovement( int _frames )
Pos.vy += yMovement;
}
DVECTOR offset = CLevel::getCameraPos();
DVECTOR const &offset = CLevel::getCameraPos();
s32 yPos = Pos.vy - offset.vy;

View file

@ -144,7 +144,7 @@ void CNpcRisingWeightHazard::render()
int x1,y1,x2,y2;
int minX, maxX, minY, maxY;
DVECTOR offset = CLevel::getCameraPos();
DVECTOR const &offset = CLevel::getCameraPos();
if ( m_isActive )
{