diff --git a/source/level/layercollision.cpp b/source/level/layercollision.cpp index f59b11f38..d5428d726 100644 --- a/source/level/layercollision.cpp +++ b/source/level/layercollision.cpp @@ -118,6 +118,7 @@ int CLayerCollision::getHeightFromGround(int _x,int _y,int _maxHeight) /*****************************************************************************/ +/* int CLayerCollision::getHeightFromCeiling(int _x,int _y,int _maxHeight) { int mapX,mapY,xFraction,yFraction; @@ -158,36 +159,7 @@ int CLayerCollision::getHeightFromCeiling(int _x,int _y,int _maxHeight) return distanceFromCeiling; } - - -/*****************************************************************************/ -int CLayerCollision::getCollisionType(int _x,int _y) -{ - int mapX,mapY,xFraction,yFraction; - int distanceFromGround; - int block,colHeight; - int ret; - - mapX=_x>>4; - mapY=(_y>>4)*MapWidth; - xFraction=_x&0x0f; - yFraction=16-(_y&0x0f); - - block=Map[mapX+mapY]; - colHeight=s_collisionTable[((block&COLLISION_MASK)*16)+xFraction]; - if(colHeight==yFraction) - { - ret=block; - } - else - { - PAUL_DBGMSG("not on ground in getCollisionType()"); - ret=0; - } - - return ret; -} - +*/ /*****************************************************************************/ #ifdef __SHOW_COLLISION__ diff --git a/source/level/layercollision.h b/source/level/layercollision.h index 3c3c3e946..9fa66c67c 100644 --- a/source/level/layercollision.h +++ b/source/level/layercollision.h @@ -22,10 +22,9 @@ virtual ~CLayerCollision(); virtual void shutdown(); - u8 Get(int X,int Y) {return(Map[X+(Y*MapWidth)]&COLLISION_MASK);} + u8 Get(int X,int Y) {return(Map[X+(Y*MapWidth)]&COLLISION_MASK);} int getHeightFromGround(int _x,int _y,int _maxHeight=32); - int getHeightFromCeiling(int _x,int _y,int _maxHeight=32); - int getCollisionType(int _x,int _y); + int getCollisionBlock(int _x,int _y) {return Map[(_x>>4)+((_y>>4)*MapWidth)];} #ifdef __SHOW_COLLISION__ void render(DVECTOR &MapPos);