This commit is contained in:
parent
e542b27acd
commit
0e9eebea26
2 changed files with 16 additions and 0 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue