Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-07-10 19:56:51 +00:00
parent 15d4c2caba
commit f819091911
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/player/player.cpp
View File

@ -815,6 +815,7 @@ if(PadGetDown(0)&PAD_TRIANGLE)
// Trying to converate? // Trying to converate?
if(m_allowConversation==false&& if(m_allowConversation==false&&
m_currentPlayerModeClass->canConverse()&&
getPadInputDown()&PI_UP) getPadInputDown()&PI_UP)
{ {
m_allowConversation=true; m_allowConversation=true;

1
source/player/pmcoral.h
View File

@ -41,6 +41,7 @@ public:
virtual void think(); virtual void think();
virtual void renderModeUi(); virtual void renderModeUi();
virtual int canDoLookAround(); virtual int canDoLookAround();
virtual int canConverse() {return m_blowerState==BLOWER_STATE__EMPTY||m_blowerState==BLOWER_STATE__FULL;}
virtual const struct PlayerMetrics *getPlayerMetrics(); virtual const struct PlayerMetrics *getPlayerMetrics();

1
source/player/pmjelly.h
View File

@ -40,6 +40,7 @@ public:
virtual void enter(); virtual void enter();
virtual void think(); virtual void think();
virtual void renderModeUi(); virtual void renderModeUi();
virtual int canConverse() {return m_firingState==FIRING_STATE__NONE;}
virtual int setState(int _state); virtual int setState(int _state);

2
source/player/pmodes.h
View File

@ -94,6 +94,7 @@ public:
virtual void springPlayerUp(int _springHeight) {;} virtual void springPlayerUp(int _springHeight) {;}
virtual void setFloating() {;} virtual void setFloating() {;}
void inSoakUpState(); void inSoakUpState();
virtual int canConverse() {return true;}
virtual int setState(int _state) {return 0;} virtual int setState(int _state) {return 0;}
virtual int getState() {return STATE_IDLE;} // ARSE.. states need to go back in CPlayer! (pkg) virtual int getState() {return STATE_IDLE;} // ARSE.. states need to go back in CPlayer! (pkg)
@ -102,6 +103,7 @@ public:
int getPadInputHeld(); int getPadInputHeld();
int getPadInputDown(); int getPadInputDown();
virtual ATTACK_STATE getAttackState() {return ATTACK_STATE__NONE;} virtual ATTACK_STATE getAttackState() {return ATTACK_STATE__NONE;}