This commit is contained in:
parent
6e70572efe
commit
89ade2cdd4
@ -801,8 +801,24 @@ if(newmode!=-1)
|
||||
m_allowConversation=true;
|
||||
}
|
||||
|
||||
// Think for the current player mode
|
||||
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
|
||||
if(m_squeakyBootsTimer)
|
||||
{
|
||||
@ -1120,6 +1136,7 @@ typedef struct
|
||||
}POSMEM;
|
||||
static POSMEM lastpos[NUM_LASTPOS];
|
||||
static int lastposnum=0;
|
||||
int drawlastpos=false;
|
||||
#endif
|
||||
|
||||
#ifdef __USER_paul__
|
||||
@ -1168,6 +1185,8 @@ if(Pos.vx!=lastpos[lastposnum].vx||Pos.vy!=lastpos[lastposnum].vy)
|
||||
p->h=getHeightFromGround(Pos.vx,Pos.vy,150);
|
||||
}
|
||||
}
|
||||
if(drawlastpos)
|
||||
{
|
||||
POSMEM *p=lastpos;
|
||||
for(int i=0;i<NUM_LASTPOS;i++)
|
||||
{
|
||||
@ -1188,6 +1207,7 @@ for(int i=0;i<NUM_LASTPOS;i++)
|
||||
|
||||
p++;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Render
|
||||
|
Loading…
Reference in New Issue
Block a user