zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-07-26 20:00:55 +00:00
parent f1fe0ed2da
commit cf9a66a91e
11 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

51
source/player/player.cpp
View file

@ -701,7 +701,6 @@ void CPlayer::shutdown()
---------------------------------------------------------------------- */
static int oldmode=-1;
int newmode=-1;
void CPlayer::think(int _frames)
{
int i;
@ -1124,7 +1123,7 @@ if(PadGetDown(0)&PAD_TRIANGLE)
}
// Ledge look-ahead stuff
if(m_ledgeLookAhead&&m_ledgeLookAhead==m_lastLedgeLookAhead)
if(m_ledgeLookAhead)
{
if(m_ledgeLookTimer<ledgeTimer)
{
@ -1134,25 +1133,22 @@ if(PadGetDown(0)&PAD_TRIANGLE)
{
int limit;
limit=(m_ledgeLookAhead*MAP2D_BLOCKSTEPSIZE)<<ledgeShift;
if(m_ledgeLookAhead>0)
if(m_ledgeLookOffset<limit)
{
// Look down
m_ledgeLookOffset+=ledgeSpeedIn*_frames;
if(m_ledgeLookOffset>limit)
{
m_ledgeLookOffset=limit;
}
}
else if(m_ledgeLookOffset>limit)
{
// Look up
m_ledgeLookOffset-=ledgeSpeedIn*_frames;
if(m_ledgeLookOffset<limit)
{
// Look down
m_ledgeLookOffset+=ledgeSpeedIn*_frames;
if(m_ledgeLookOffset>limit)
{
m_ledgeLookOffset=limit;
}
}
else if(m_ledgeLookOffset>limit)
{
// Look up
m_ledgeLookOffset-=ledgeSpeedIn*_frames;
if(m_ledgeLookOffset<limit)
{
m_ledgeLookOffset=limit;
}
m_ledgeLookOffset=limit;
}
}
}
@ -1180,8 +1176,6 @@ if(PadGetDown(0)&PAD_TRIANGLE)
}
}
}
m_lastLedgeLookAhead=m_ledgeLookAhead;
m_ledgeLookAhead=0;
// Camera focus point stuff
calcCameraFocusPointTarget();
@ -1600,6 +1594,21 @@ int CPlayer::getHeightFromGroundNoPlatform(int _x,int _y,int _maxHeight=32)
return( CGameScene::getCollision()->getHeightFromGround(_x,_y,_maxHeight) );
}
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CPlayer::setLedgeLookAhead(int _lookAhead)
{
if(m_ledgeLookAhead!=_lookAhead)
{
m_ledgeLookAhead=_lookAhead;
m_ledgeLookTimer=0;
}
}
/*----------------------------------------------------------------------
Function:
Purpose:
@ -1898,7 +1907,7 @@ void CPlayer::respawn()
m_cameraPos.vy=m_currentCamFocusPoint.vy;
m_padLookAroundTimer=0;
m_ledgeLookAhead=m_lastLedgeLookAhead=0;
m_ledgeLookAhead=0;
m_ledgeLookOffset=0;
m_ledgeLookTimer=0;
m_tryingToManuallyPickupWeapon=false;