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-05-01 21:43:14 +00:00
parent e542b27acd
commit 0e9eebea26
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/player/player.cpp
View file

@ -782,6 +782,17 @@ else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64;
m_cameraPos.vy=m_mapCameraEdges.vy; m_cameraPos.vy=m_mapCameraEdges.vy;
} }
// Trying to converate?
if(getPadInputDown()&PI_DOWN)
{
m_allowConversation=true;
}
else
{
m_allowConversation=false;
}
CPlayerThing::think(_frames); CPlayerThing::think(_frames);
} }
@ -1178,6 +1189,8 @@ void CPlayer::respawn()
setMode(PLAYER_MODE_BASICUNARMED); setMode(PLAYER_MODE_BASICUNARMED);
} }
m_allowConversation=false;
m_health=MAX_HEALTH; m_health=MAX_HEALTH;
m_healthReactFrames=0; m_healthReactFrames=0;
m_invincibleFrameCount=INVINCIBLE_FRAMES__START; m_invincibleFrameCount=INVINCIBLE_FRAMES__START;

3
source/player/player.h
View file

@ -167,6 +167,8 @@ public:
virtual void setHasPlatformCollided( bool newVal ); virtual void setHasPlatformCollided( bool newVal );
virtual bool getHasPlatformCollided(); virtual bool getHasPlatformCollided();
int isTryingToConversateWithFriend() {return m_allowConversation;}
DVECTOR getCameraPos() {return m_cameraPos;} DVECTOR getCameraPos() {return m_cameraPos;}
void setLayerCollision(class CLayerCollision *_layer) {m_layerCollision=_layer;} void setLayerCollision(class CLayerCollision *_layer) {m_layerCollision=_layer;}
@ -202,6 +204,7 @@ private:
void playAnimFrameSfx(int _animNo,int _animFrame); void playAnimFrameSfx(int _animNo,int _animFrame);
DVECTOR m_moveVelocity; DVECTOR m_moveVelocity;
int m_allowConversation;