zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-08-14 19:19:13 +00:00
parent 86e2243ddb
commit 4dbd7f53b8
2 changed files with 40 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

14
source/level/layercollision.h
View file

@ -33,24 +33,28 @@ virtual void shutdown();
int getHeightFromGroundExcluding(int _x,int _y,int _exclusion,int _maxHeight=32);
int getHeightFromGroundNonSB(int _x,int _y,int _maxHeight=32) {return( CLayerCollision::getHeightFromGroundExcluding( _x, _y, COLLISION_TYPE_FLAG_SB_NOMOVE, _maxHeight ) );}
int getHeightFromGroundCart(int _x,int _y,int _maxHeight=32);
int getHeightFromGroundAmmo(int _x,int _y,int _maxHeight=32);
int getHeightFromGroundAmmo(int _x,int _y,int _maxHeight=32) {return(CLayerCollision::getHeightFromGroundExcluding( _x, _y, COLLISION_TYPE_FLAG_NORMAL, _maxHeight ));}
inline u8 *getMapPtr(int _x,int _y)
inline u8 *getMapPtr(int X,int Y)
{
int Ofs=(_x>>4)+GetYPos(_y>>4);
X>>=4;
Y>>=4;
ASSERT((Y>=0-COL_Y_OFS) && (Y<MapHeight+COL_Y_OFS));
int Ofs=(X)+GetYPos(Y);
return(&Map[Ofs]);
// return(&Map[(_x>>4)+((_y>>4)*MapWidth)]);
}
inline int getCollisionBlock(int _x,int _y)
inline int getCollisionBlock(int X,int Y)
{
u8 Col=*getMapPtr(_x,_y);
u8 Col=*getMapPtr(X,Y);
return (Col);
// return Map[(_x>>4)+((_y>>4)*MapWidth)];
}
inline u8 Get(int X,int Y)
{
ASSERT((Y>=0-COL_Y_OFS) && (Y<MapHeight+COL_Y_OFS));
int Ofs=(X)+GetYPos(Y);
return(Map[Ofs] & COLLISION_TILE_MASK);
// return(Map[X+(Y*MapWidth)]&COLLISION_TILE_MASK);