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-06-12 16:28:39 +00:00
parent 6da99378f2
commit ccdfbb881f
7 changed files with 46 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
source/player/pmodes.cpp
View file

@ -70,6 +70,10 @@
#include "player\psspring.h"
#endif
#ifndef __PLAYER_PSCART_H__
#include "player\pscart.h"
#endif
#ifndef __PLATFORM_PLATFORM_H__
#include "platform\platform.h"
#endif
@ -122,6 +126,7 @@ static CPlayerState *s_stateTable[]=
&s_stateLookDown, // STATE_LOOKDOWN
&s_stateLookDownRelax, // STATE_LOOKDOWNRELAX
&s_stateJumpBack, // STATE_JUMPBACK
&s_stateCart, // STATE_CART
};
static PlayerMetrics s_playerMetrics=
@ -199,19 +204,7 @@ void CPlayerModeBase::think()
{
getStateTable()[m_currentState]->think(this);
thinkVerticalMovement();
if ( m_player->isOnPlatform() )
{
CNpcPlatform *platform = (CNpcPlatform *) m_player->isOnPlatform();
if ( !platform->isCart() )
{
thinkHorizontalMovement();
}
}
else
{
thinkHorizontalMovement();
}
thinkHorizontalMovement();
// Teeter if on an edge
if(canTeeter()&&isOnEdge())
@ -634,18 +627,6 @@ int CPlayerModeBase::slowdown()
}
void CPlayerModeBase::jump()
{
CNpcPlatform *platform;
platform = (CNpcPlatform *) m_player->isOnPlatform();
if(platform)
{
if ( platform->isCart() )
{
platform->jump();
return;
}
}
DVECTOR moveVel;
moveVel=*m_player->getMoveVelocity();
moveVel.vy=-getPlayerMetrics()->m_metric[PM__JUMP_VELOCITY]<<VELOCITY_SHIFT;