Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-05-01 21:59:49 +00:00
parent 0647bd1544
commit c70cd19edf
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/player/player.cpp
View File

@ -588,6 +588,17 @@ if(newmode!=-1)
{
// Think
updatePadInput();
// Trying to converate?
if(getPadInputDown()&PI_UP)
{
m_allowConversation=true;
}
else
{
m_allowConversation=false;
}
m_currentPlayerModeClass->think();
// Powerups
@ -782,17 +793,6 @@ else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64;
m_cameraPos.vy=m_mapCameraEdges.vy;
}
// Trying to converate?
if(getPadInputDown()&PI_DOWN)
{
m_allowConversation=true;
}
else
{
m_allowConversation=false;
}
CPlayerThing::think(_frames);
}
@ -848,8 +848,6 @@ for(int i=0;i<NUM_LASTPOS;i++)
#endif
// Render
if(m_invincibleFrameCount==0||m_invincibleFrameCount&2)
{
DVECTOR sbPos=
{
Pos.vx-m_cameraPos.vx,
@ -857,7 +855,6 @@ for(int i=0;i<NUM_LASTPOS;i++)
};
renderSb(&sbPos,m_animNo,m_animFrame>>sbanimspeed);
m_currentPlayerModeClass->render(&sbPos);
}
#ifdef _STATE_DEBUG_
@ -1224,8 +1221,12 @@ void CPlayer::respawn()
---------------------------------------------------------------------- */
void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame)
{
POLY_FT4 *ft4;
int flash;
int addon;
flash=m_invincibleFrameCount&2==2;
// Render an addon?
addon=s_addonNumbers[m_currentMode];
if(addon!=NO_ADDON)