This commit is contained in:
parent
15d4c2caba
commit
f819091911
@ -815,6 +815,7 @@ if(PadGetDown(0)&PAD_TRIANGLE)
|
||||
|
||||
// Trying to converate?
|
||||
if(m_allowConversation==false&&
|
||||
m_currentPlayerModeClass->canConverse()&&
|
||||
getPadInputDown()&PI_UP)
|
||||
{
|
||||
m_allowConversation=true;
|
||||
|
@ -41,6 +41,7 @@ public:
|
||||
virtual void think();
|
||||
virtual void renderModeUi();
|
||||
virtual int canDoLookAround();
|
||||
virtual int canConverse() {return m_blowerState==BLOWER_STATE__EMPTY||m_blowerState==BLOWER_STATE__FULL;}
|
||||
|
||||
virtual const struct PlayerMetrics *getPlayerMetrics();
|
||||
|
||||
|
@ -40,6 +40,7 @@ public:
|
||||
virtual void enter();
|
||||
virtual void think();
|
||||
virtual void renderModeUi();
|
||||
virtual int canConverse() {return m_firingState==FIRING_STATE__NONE;}
|
||||
|
||||
virtual int setState(int _state);
|
||||
|
||||
|
@ -94,6 +94,7 @@ public:
|
||||
virtual void springPlayerUp(int _springHeight) {;}
|
||||
virtual void setFloating() {;}
|
||||
void inSoakUpState();
|
||||
virtual int canConverse() {return true;}
|
||||
|
||||
virtual int setState(int _state) {return 0;}
|
||||
virtual int getState() {return STATE_IDLE;} // ARSE.. states need to go back in CPlayer! (pkg)
|
||||
@ -102,6 +103,7 @@ public:
|
||||
int getPadInputHeld();
|
||||
int getPadInputDown();
|
||||
|
||||
|
||||
virtual ATTACK_STATE getAttackState() {return ATTACK_STATE__NONE;}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user