Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-05-30 19:21:32 +00:00
parent 6e70572efe
commit 89ade2cdd4
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/player/player.cpp
View File

@ -801,8 +801,24 @@ if(newmode!=-1)
m_allowConversation=true; m_allowConversation=true;
} }
// Think for the current player mode
m_currentPlayerModeClass->think(); m_currentPlayerModeClass->think();
// Conveyor belt movement
if(getHeightFromGroundNoPlatform(Pos.vx,Pos.vy,5)==0)
{
int block;
block=CGameScene::getCollision()->getCollisionBlock(Pos.vx,Pos.vy)&COLLISION_TYPE_MASK;
if(block==COLLISION_TYPE_FLAG_MOVE_LEFT)
{
moveHorizontal(-1);
}
else if(block==COLLISION_TYPE_FLAG_MOVE_RIGHT)
{
moveHorizontal(+1);
}
}
// Powerups // Powerups
if(m_squeakyBootsTimer) if(m_squeakyBootsTimer)
{ {
@ -1120,6 +1136,7 @@ typedef struct
}POSMEM; }POSMEM;
static POSMEM lastpos[NUM_LASTPOS]; static POSMEM lastpos[NUM_LASTPOS];
static int lastposnum=0; static int lastposnum=0;
int drawlastpos=false;
#endif #endif
#ifdef __USER_paul__ #ifdef __USER_paul__
@ -1168,25 +1185,28 @@ if(Pos.vx!=lastpos[lastposnum].vx||Pos.vy!=lastpos[lastposnum].vy)
p->h=getHeightFromGround(Pos.vx,Pos.vy,150); p->h=getHeightFromGround(Pos.vx,Pos.vy,150);
} }
} }
POSMEM *p=lastpos; if(drawlastpos)
for(int i=0;i<NUM_LASTPOS;i++)
{ {
int x,y; POSMEM *p=lastpos;
x=p->vx-m_cameraPos.vx; for(int i=0;i<NUM_LASTPOS;i++)
y=p->vy-m_cameraPos.vy;
DrawLine(x-4,y-4,x+4,y+4,0,0,255,0);
DrawLine(x-4,y+4,x+4,y-4,0,0,255,0);
y=y+p->h;
if(p->onp)
{ {
DrawLine(x-6,y,x+6,y,255,0,255,0); int x,y;
} x=p->vx-m_cameraPos.vx;
else y=p->vy-m_cameraPos.vy;
{ DrawLine(x-4,y-4,x+4,y+4,0,0,255,0);
DrawLine(x-6,y,x+6,y,128,0,255,0); DrawLine(x-4,y+4,x+4,y-4,0,0,255,0);
} y=y+p->h;
if(p->onp)
{
DrawLine(x-6,y,x+6,y,255,0,255,0);
}
else
{
DrawLine(x-6,y,x+6,y,128,0,255,0);
}
p++; p++;
}
} }
#endif #endif