This commit is contained in:
parent
232f8d7f71
commit
1f98a0beab
5 changed files with 21 additions and 0 deletions
|
@ -60,6 +60,11 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
|
|||
|
||||
s32 playerMovement = player->getMovement();
|
||||
|
||||
if ( !playerMovement )
|
||||
{
|
||||
playerMovement = player->getMoveLeftRight();
|
||||
}
|
||||
|
||||
m_currentSpeed = -playerMovement;
|
||||
}
|
||||
else
|
||||
|
|
|
@ -773,6 +773,7 @@ if(newmode!=-1)
|
|||
m_allowConversation=false;
|
||||
|
||||
m_xMove = Pos.vx;
|
||||
m_moveLeftRight = 0;
|
||||
|
||||
///
|
||||
#ifdef __USER_paul__
|
||||
|
|
|
@ -512,9 +512,12 @@ public:
|
|||
// Movement tracking for barrels
|
||||
|
||||
s32 getMovement() {return( m_xMove );}
|
||||
s8 getMoveLeftRight() {return( m_moveLeftRight );}
|
||||
void setMoveLeftRight( s8 newLeftRight ) {m_moveLeftRight = newLeftRight;}
|
||||
|
||||
private:
|
||||
s32 m_xMove;
|
||||
s8 m_moveLeftRight;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -81,11 +81,17 @@ void CPlayerStateBaseIdle::thinkControl(CPlayerModeBase *_playerMode)
|
|||
}
|
||||
else if(controlHeld&PI_LEFT)
|
||||
{
|
||||
CPlayer *player = _playerMode->getPlayer();
|
||||
player->setMoveLeftRight( player->getMoveLeftRight() - 1 );
|
||||
|
||||
if(_playerMode->canMoveLeft())
|
||||
_playerMode->setState(STATE_RUN);
|
||||
}
|
||||
else if(controlHeld&PI_RIGHT)
|
||||
{
|
||||
CPlayer *player = _playerMode->getPlayer();
|
||||
player->setMoveLeftRight( player->getMoveLeftRight() + 1 );
|
||||
|
||||
if(_playerMode->canMoveRight())
|
||||
_playerMode->setState(STATE_RUN);
|
||||
}
|
||||
|
|
|
@ -126,10 +126,16 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
|
|||
|
||||
if(controlHeld&PI_LEFT)
|
||||
{
|
||||
CPlayer *player = _playerMode->getPlayer();
|
||||
player->setMoveLeftRight( player->getMoveLeftRight() - 1 );
|
||||
|
||||
_playerMode->moveLeft();
|
||||
}
|
||||
else if(controlHeld&PI_RIGHT)
|
||||
{
|
||||
CPlayer *player = _playerMode->getPlayer();
|
||||
player->setMoveLeftRight( player->getMoveLeftRight() + 1 );
|
||||
|
||||
_playerMode->moveRight();
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Reference in a new issue