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-13 16:37:04 +00:00
parent 2e965324cb
commit 89b0aa146b
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/player/player.cpp
View file

@ -37,10 +37,6 @@
#include "player\pmodes.h" #include "player\pmodes.h"
#endif #endif
#ifndef __UTILS_HEADER__
#include "utils\utils.h"
#endif
// to be removed // to be removed
#include "gfx\tpage.h" #include "gfx\tpage.h"
@ -420,6 +416,12 @@ void CPlayer::thinkVerticalMovement()
colHeight=m_layerCollision->getHeightFromGround(Pos.vx,Pos.vy,1); colHeight=m_layerCollision->getHeightFromGround(Pos.vx,Pos.vy,1);
//New collision stuff (pkg)
//if(m_layerCollision->getCollisionType(Pos.vx,Pos.vy+(m_moveVel.vy>>VELOCITY_SHIFT))&COLLISION_TYPE_MASK)
//{
// m_moveVel.vy=0;
// return;
//}
if(colHeight>=0) if(colHeight>=0)
{ {
// Above or on the ground // Above or on the ground
@ -508,6 +510,12 @@ void CPlayer::thinkHorizontalMovement()
{ {
if(m_moveVel.vx) if(m_moveVel.vx)
{ {
//New collision stuff (pkg)
//if(m_layerCollision->getCollisionType(Pos.vx+(m_moveVel.vx>>VELOCITY_SHIFT),Pos.vy)&COLLISION_TYPE_MASK)
//{
// m_moveVel.vx=0;
// return;
//}
int colHeight; int colHeight;
colHeight=m_layerCollision->getHeightFromGround(Pos.vx,Pos.vy,5); colHeight=m_layerCollision->getHeightFromGround(Pos.vx,Pos.vy,5);
if(colHeight==0) if(colHeight==0)