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

Browse source
This commit is contained in:
Paul 2001-07-21 19:14:40 +00:00
parent d105d9ee97
commit 7824d285ac
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/platform/psbarrel.cpp
View file

@ -54,6 +54,8 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
if ( m_contact )
{
player->setReverseCameraMovement(true);
DVECTOR playerPos = player->getPos();
s32 playerMovement = player->getMovement();

2
source/platform/psoil.cpp
View file

@ -44,6 +44,8 @@ void CNpcSteerableOildrumPlatform::processMovement( int _frames )
if ( m_contact )
{
player->setReverseCameraMovement(true);
DVECTOR playerPos = player->getPos();
s32 playerMovement = player->getMovement();

9
source/player/player.cpp
View file

@ -645,6 +645,7 @@ m_animFrame=0;
m_lastPadInput=m_padInput=PI_NONE;
setCartCam(false);
setReverseCameraMovement(false);
resetPlayerCollisionSizeToBase();
@ -773,6 +774,7 @@ if(PadGetDown(0)&PAD_TRIANGLE)
#endif
///
for(i=0;i<_frames;i++)
{
updatePadInput();
@ -1209,6 +1211,9 @@ if(PadGetDown(0)&PAD_TRIANGLE)
m_ignoreNewlyPressedButtonsOnPadThisThink=false;
// Restore flipped camera
setReverseCameraMovement(false);
CPlayerThing::think(_frames);
}
@ -2473,7 +2478,7 @@ void CPlayer::moveLeft()
{
if(m_moveVelocity.vx<-CAMERA_STARTMOVETHRESHOLD||m_cameraXScrollPos<-(CAMERA_SCROLLTHRESHOLD*CAMERA_TILESIZE)<<CAMERA_ACCURACYSHIFT)
{
m_cameraXScrollDir=+1;
m_cameraXScrollDir=m_reverseCameraMovement==false?+1:-1;
}
else if(m_moveVelocity.vx>-CAMERA_STOPMOVETHRESHOLD)
{
@ -2484,7 +2489,7 @@ void CPlayer::moveRight()
{
if(m_moveVelocity.vx>CAMERA_STARTMOVETHRESHOLD||m_cameraXScrollPos>(CAMERA_SCROLLTHRESHOLD*CAMERA_TILESIZE)<<CAMERA_ACCURACYSHIFT)
{
m_cameraXScrollDir=-1;
m_cameraXScrollDir=m_reverseCameraMovement==false?-1:+1;
}
else if(m_moveVelocity.vx<CAMERA_STOPMOVETHRESHOLD)
{

2
source/player/player.h
View file

@ -238,6 +238,7 @@ public:
DVECTOR getCameraPos() {return m_cameraPos;}
void setCartCam(int _flag) {m_cartCamActive=_flag;}
void setReverseCameraMovement(int _flag) {m_reverseCameraMovement=_flag;}
void setCameraBox(CameraBox _cameraBox);
void setRespawnPos(DVECTOR _respawn) {m_respawnPos=_respawn;}
void setRespawnPosAndRingTelephone(DVECTOR _respawn);
@ -329,6 +330,7 @@ private:
CActorGfx *m_actorGfx;
int m_cartCamActive;
int m_reverseCameraMovement;
int m_lockCamera;
DVECTOR m_cameraPos;
DVECTOR m_currentCamFocusPointTarget;