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-03-27 20:00:44 +00:00
parent 325376fd43
commit 2e20ec373b
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/player/player.h
View file

@ -196,7 +196,7 @@ private:
enum enum
{ {
INVIBCIBLE_FRAMES__START=120, // Invincible for this many frames at start of life INVINCIBLE_FRAMES__START=120, // Invincible for this many frames at start of life
INVINCIBLE_FRAMES__HIT=50, // Invincible for this many frames after taking damage INVINCIBLE_FRAMES__HIT=50, // Invincible for this many frames after taking damage
LOOKAROUND_DELAY=90, // Frames before look around starts LOOKAROUND_DELAY=90, // Frames before look around starts

11
source/player/pmodes.cpp
View file

@ -435,7 +435,10 @@ int CPlayerModeBase::setState(int _state)
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
int CPlayerModeBase::getFacing() {return m_player->getFacing();} int CPlayerModeBase::getFacing() {return m_player->getFacing();}
void CPlayerModeBase::setFacing(int _facing) {m_player->setFacing(_facing);} void CPlayerModeBase::setFacing(int _facing) {m_player->setFacing(_facing);}
void CPlayerModeBase::setAnimNo(int _animNo) {m_player->setAnimNo(_animNo);} int CPlayerModeBase::getAnimNo() {return m_player->getAnimNo();}
void CPlayerModeBase::setAnimNo(int _animNo) {m_player->setAnimNo(_animNo);setAnimFrame(0);}
int CPlayerModeBase::getAnimFrame() {return m_player->getAnimFrame();}
int CPlayerModeBase::getAnimFrameCount() {return m_player->getAnimFrameCount();}
void CPlayerModeBase::setAnimFrame(int _animFrame) {m_player->setAnimFrame(_animFrame);} void CPlayerModeBase::setAnimFrame(int _animFrame) {m_player->setAnimFrame(_animFrame);}
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -448,15 +451,15 @@ int CPlayerModeBase::advanceAnimFrameAndCheckForEndOfAnim()
{ {
int animFrame,frameCount; int animFrame,frameCount;
int looped; int looped;
animFrame=m_player->getAnimFrame()+1; animFrame=getAnimFrame()+1;
frameCount=m_player->getAnimFrameCount(); frameCount=getAnimFrameCount();
looped=false; looped=false;
if(animFrame>=frameCount) if(animFrame>=frameCount)
{ {
looped=true; looped=true;
animFrame=0; animFrame=0;
} }
m_player->setAnimFrame(animFrame); setAnimFrame(animFrame);
return looped; return looped;
} }