This commit is contained in:
Paul 2001-05-15 21:41:39 +00:00
parent bc1a16538b
commit 8c2b43d7c3
2 changed files with 8 additions and 5 deletions

View file

@ -763,10 +763,13 @@ if(newmode!=-1)
} }
// Stop the player vanishing off the edge of the telly.. // Stop the player vanishing off the edge of the telly..
if(!m_lockCamera)
{
if(Pos.vx<m_playerPosLimitBox.x1) Pos.vx=m_playerPosLimitBox.x1; if(Pos.vx<m_playerPosLimitBox.x1) Pos.vx=m_playerPosLimitBox.x1;
else if(Pos.vx>m_playerPosLimitBox.x2) Pos.vx=m_playerPosLimitBox.x2; else if(Pos.vx>m_playerPosLimitBox.x2) Pos.vx=m_playerPosLimitBox.x2;
if(Pos.vy<m_playerPosLimitBox.y1) Pos.vy=m_playerPosLimitBox.y1; if(Pos.vy<m_playerPosLimitBox.y1) Pos.vy=m_playerPosLimitBox.y1;
else if(Pos.vy>m_playerPosLimitBox.y2) Pos.vy=m_playerPosLimitBox.y2; else if(Pos.vy>m_playerPosLimitBox.y2) Pos.vy=m_playerPosLimitBox.y2;
}
// Look around // Look around
int pad=getPadInputHeld(); int pad=getPadInputHeld();

View file

@ -75,7 +75,7 @@ void CPlayerModeDead::think()
m_player->setAnimFrame(m_deadTime); m_player->setAnimFrame(m_deadTime);
} }
m_player->moveVertical(5); m_player->moveVertical(5);
if((m_deadTime>DEATH_DELAY&&m_player->getPadInputDown()&PI_FIRE)|| if((m_deadTime>DEATH_DELAY&&m_player->getPadInputDown()&PI_FIRE)||
m_deadTime>DEATH_TIMEOUT) m_deadTime>DEATH_TIMEOUT)