diff --git a/source/player/player.cpp b/source/player/player.cpp index 1bfdb234a..22864863b 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -782,6 +782,17 @@ 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); } @@ -1178,6 +1189,8 @@ void CPlayer::respawn() setMode(PLAYER_MODE_BASICUNARMED); } + m_allowConversation=false; + m_health=MAX_HEALTH; m_healthReactFrames=0; m_invincibleFrameCount=INVINCIBLE_FRAMES__START; diff --git a/source/player/player.h b/source/player/player.h index 1218f8c5b..006c7bd42 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -167,6 +167,8 @@ public: virtual void setHasPlatformCollided( bool newVal ); virtual bool getHasPlatformCollided(); + int isTryingToConversateWithFriend() {return m_allowConversation;} + DVECTOR getCameraPos() {return m_cameraPos;} void setLayerCollision(class CLayerCollision *_layer) {m_layerCollision=_layer;} @@ -202,6 +204,7 @@ private: void playAnimFrameSfx(int _animNo,int _animFrame); DVECTOR m_moveVelocity; + int m_allowConversation;