zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-08-13 16:31:14 +00:00
parent 232f8d7f71
commit 1f98a0beab
5 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/platform/psbarrel.cpp
View file

@ -60,6 +60,11 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
s32 playerMovement = player->getMovement(); s32 playerMovement = player->getMovement();
if ( !playerMovement )
{
playerMovement = player->getMoveLeftRight();
}
m_currentSpeed = -playerMovement; m_currentSpeed = -playerMovement;
} }
else else

1
source/player/player.cpp
View file

@ -773,6 +773,7 @@ if(newmode!=-1)
m_allowConversation=false; m_allowConversation=false;
m_xMove = Pos.vx; m_xMove = Pos.vx;
m_moveLeftRight = 0;
/// ///
#ifdef __USER_paul__ #ifdef __USER_paul__

3
source/player/player.h
View file

@ -512,9 +512,12 @@ public:
// Movement tracking for barrels // Movement tracking for barrels
s32 getMovement() {return( m_xMove );} s32 getMovement() {return( m_xMove );}
s8 getMoveLeftRight() {return( m_moveLeftRight );}
void setMoveLeftRight( s8 newLeftRight ) {m_moveLeftRight = newLeftRight;}
private: private:
s32 m_xMove; s32 m_xMove;
s8 m_moveLeftRight;
}; };

6
source/player/psidle.cpp
View file

@ -81,11 +81,17 @@ void CPlayerStateBaseIdle::thinkControl(CPlayerModeBase *_playerMode)
} }
else if(controlHeld&PI_LEFT) else if(controlHeld&PI_LEFT)
{ {
CPlayer *player = _playerMode->getPlayer();
player->setMoveLeftRight( player->getMoveLeftRight() - 1 );
if(_playerMode->canMoveLeft()) if(_playerMode->canMoveLeft())
_playerMode->setState(STATE_RUN); _playerMode->setState(STATE_RUN);
} }
else if(controlHeld&PI_RIGHT) else if(controlHeld&PI_RIGHT)
{ {
CPlayer *player = _playerMode->getPlayer();
player->setMoveLeftRight( player->getMoveLeftRight() + 1 );
if(_playerMode->canMoveRight()) if(_playerMode->canMoveRight())
_playerMode->setState(STATE_RUN); _playerMode->setState(STATE_RUN);
} }

6
source/player/psrun.cpp
View file

@ -126,10 +126,16 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
if(controlHeld&PI_LEFT) if(controlHeld&PI_LEFT)
{ {
CPlayer *player = _playerMode->getPlayer();
player->setMoveLeftRight( player->getMoveLeftRight() - 1 );
_playerMode->moveLeft(); _playerMode->moveLeft();
} }
else if(controlHeld&PI_RIGHT) else if(controlHeld&PI_RIGHT)
{ {
CPlayer *player = _playerMode->getPlayer();
player->setMoveLeftRight( player->getMoveLeftRight() + 1 );
_playerMode->moveRight(); _playerMode->moveRight();
} }
else else