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-01-25 22:19:47 +00:00
parent f477795249
commit c309d5b9bd
2 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
source/player/player.cpp
View file

@ -167,8 +167,8 @@ m_animFrame=0;
m_invincibleFrameCount=INVIBCIBLE_FRAMES__START; m_invincibleFrameCount=INVIBCIBLE_FRAMES__START;
#ifdef __USER_paul__ #ifdef __USER_paul__
Pos.vx=50; Pos.vx=23*16;
Pos.vy=200; Pos.vy=23*16;
#else #else
Pos.vx=10; Pos.vx=10;
Pos.vy=10; Pos.vy=10;
@ -197,7 +197,7 @@ void CPlayer::shutdown()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
DVECTOR ofs={0,0}; DVECTOR ofs={-240,-134}; // nearly -256,-128 ;)
void CPlayer::think(int _frames) void CPlayer::think(int _frames)
{ {
int i; int i;
@ -211,6 +211,7 @@ void CPlayer::think(int _frames)
if(padInput&PAD_DOWN) Pos.vy+=move; if(padInput&PAD_DOWN) Pos.vy+=move;
if(padInput&PAD_LEFT) Pos.vx-=move; if(padInput&PAD_LEFT) Pos.vx-=move;
if(padInput&PAD_RIGHT) Pos.vx+=move; if(padInput&PAD_RIGHT) Pos.vx+=move;
m_invincibleFrameCount=0;
#else #else
if(_frames>=3)_frames=2; if(_frames>=3)_frames=2;
@ -218,10 +219,22 @@ void CPlayer::think(int _frames)
{ {
// Think // Think
m_currentState->think(this); m_currentState->think(this);
Pos.vx+=m_moveVel.vx>>VELOCITY_SHIFT;
Pos.vy+=m_moveVel.vy>>VELOCITY_SHIFT;
// Ground collision // Horizontal movement
Pos.vx+=m_moveVel.vx>>VELOCITY_SHIFT;
if(Pos.vx<350)
{
if(m_state==STATE_RUN)
{
setState(STATE_IDLE);
setAnimNo(ANIM_PLAYER_ANIM_RUNSTOP);
}
Pos.vx=350;
m_moveVel.vx=0;
}
// Vertical movement
Pos.vy+=m_moveVel.vy>>VELOCITY_SHIFT;
if(isOnSolidGround()) if(isOnSolidGround())
{ {
if(m_moveVel.vy) if(m_moveVel.vy)
@ -278,13 +291,12 @@ void CPlayer::think(int _frames)
#endif #endif
m_invincibleFrameCount=0;
// Move the camera offset // Move the camera offset
m_cameraOffsetTarget=ofs;
m_cameraOffset=ofs;
/*
for(i=0;i<_frames;i++) for(i=0;i<_frames;i++)
{ {
m_cameraOffsetTarget=ofs;
m_cameraOffset=ofs;
/*
int moveDelta; int moveDelta;
moveDelta=(m_cameraOffset.vx-m_cameraOffsetTarget.vx); moveDelta=(m_cameraOffset.vx-m_cameraOffsetTarget.vx);
if(moveDelta) if(moveDelta)
@ -301,8 +313,8 @@ m_invincibleFrameCount=0;
} }
m_cameraOffset.vx+=moveDelta; m_cameraOffset.vx+=moveDelta;
} }
*/
} }
*/
if(Pos.vx<0)Pos.vx=0; if(Pos.vx<0)Pos.vx=0;
if(Pos.vy<0)Pos.vy=0; if(Pos.vy<0)Pos.vy=0;
} }
@ -344,8 +356,8 @@ void CPlayer::render()
DVECTOR CPlayer::getCameraPos() DVECTOR CPlayer::getCameraPos()
{ {
DVECTOR cameraPos; DVECTOR cameraPos;
cameraPos.vx=Pos.vx;//+m_cameraOffset.vx; cameraPos.vx=Pos.vx+m_cameraOffset.vx;
cameraPos.vy=Pos.vy;//+m_cameraOffset.vy; cameraPos.vy=Pos.vy+m_cameraOffset.vy;
return cameraPos; return cameraPos;
} }
@ -399,11 +411,11 @@ void CPlayer::setFacing(int _facing)
{ {
case FACING_LEFT: case FACING_LEFT:
m_facing=FACING_LEFT; m_facing=FACING_LEFT;
m_skel.setAng(1024); m_skel.setAng(512);//1024);
break; break;
case FACING_RIGHT: case FACING_RIGHT:
m_facing=FACING_RIGHT; m_facing=FACING_RIGHT;
m_skel.setAng(-1024); m_skel.setAng(3096+512);//-1024);
break; break;
default: default:
ASSERT(0); ASSERT(0);
@ -462,11 +474,16 @@ int CPlayer::getPadInput()
int CPlayer::isOnSolidGround() int CPlayer::isOnSolidGround()
{ {
return Pos.vy>16*15; return Pos.vy>23*16;//16*15;
} }
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CPlayer::moveLeft() void CPlayer::moveLeft()
{ {

3
source/player/player.h
View file

@ -112,6 +112,7 @@ public:
protected: protected:
const PlayerMetrics *getPlayerMetrics(); const PlayerMetrics *getPlayerMetrics();
// State
void setState(PLAYER_STATE _state); void setState(PLAYER_STATE _state);
int getFacing(); int getFacing();
void setFacing(int _facing); void setFacing(int _facing);
@ -124,8 +125,10 @@ protected:
void setMoveVelocity(DVECTOR *_moveVel); void setMoveVelocity(DVECTOR *_moveVel);
virtual int getPadInput(); virtual int getPadInput();
// Collision
int isOnSolidGround(); int isOnSolidGround();
// Movement
void moveLeft(); void moveLeft();
void moveRight(); void moveRight();
void slowdown(); void slowdown();