This commit is contained in:
parent
cc21912c1a
commit
5fe1a58de3
7 changed files with 39 additions and 32 deletions
|
@ -5,35 +5,42 @@
|
|||
#ifndef __DATA_STRUCTS_HEADER__
|
||||
#define __DATA_STRUCTS_HEADER__
|
||||
|
||||
|
||||
//***************************************************************************
|
||||
// Taken from Map editor layerdef.h
|
||||
enum PSX_COLLSION_ENUM
|
||||
{
|
||||
COLLISION_TYPE_BLANK =0,
|
||||
COLLISION_TYPE_NORMAL =0,
|
||||
COLLISION_TYPE_DAMAGE =1,
|
||||
COLLISION_TYPE_SLIPPERY =2,
|
||||
COLLISION_TYPE_ELECTRIC =3,
|
||||
COLLISION_TYPE_STICKY =4,
|
||||
COLLISION_TYPE_WATER =5,
|
||||
COLLISION_TYPE_SOLID =6,
|
||||
COLLISION_TYPE_DEATH =7,
|
||||
// COLLISION_TYPE_DESTRUCTABLE =8,
|
||||
COLLISION_TYPE_DESTRUCTABLE =COLLISION_TYPE_STICKY,
|
||||
COLLISION_TYPE_BLANK =0,
|
||||
COLLISION_TYPE_NORMAL =0,
|
||||
COLLISION_TYPE_DAMAGE =1,
|
||||
COLLISION_TYPE_SLIPPERY =2,
|
||||
COLLISION_TYPE_ELECTRIC =3,
|
||||
COLLISION_TYPE_DESTRUCTABLE_WALL =4,
|
||||
COLLISION_TYPE_DEATH_LIQUID =5,
|
||||
COLLISION_TYPE_SOLID =6,
|
||||
COLLISION_TYPE_DEATH_FALL =7,
|
||||
COLLISION_TYPE_DESTRUCTABLE_FLOOR =8,
|
||||
COLLISION_TYPE_DEATH_INSTANT =9,
|
||||
COLLISION_TYPE_MOVE_LEFT =10,
|
||||
COLLISION_TYPE_MOVE_RIGHT =11,
|
||||
|
||||
COLLISION_TYPE_FLAG_SHIFT =5,
|
||||
COLLISION_TYPE_FLAG_NORMAL =COLLISION_TYPE_NORMAL << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DAMAGE =COLLISION_TYPE_DAMAGE << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_SLIPPERY =COLLISION_TYPE_SLIPPERY << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_ELECTRIC =COLLISION_TYPE_ELECTRIC << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_STICKY =COLLISION_TYPE_STICKY << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_WATER =COLLISION_TYPE_WATER << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_SOLID =COLLISION_TYPE_SOLID << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DEATH =COLLISION_TYPE_DEATH << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DESTRUCTABLE =COLLISION_TYPE_DESTRUCTABLE << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_SHIFT =3,
|
||||
COLLISION_TYPE_FLAG_NORMAL =COLLISION_TYPE_NORMAL << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DAMAGE =COLLISION_TYPE_DAMAGE << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_SLIPPERY =COLLISION_TYPE_SLIPPERY << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_ELECTRIC =COLLISION_TYPE_ELECTRIC << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DESTRUCTABLE_WALL =COLLISION_TYPE_DESTRUCTABLE_WALL << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DEATH_LIQUID =COLLISION_TYPE_DEATH_LIQUID << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_SOLID =COLLISION_TYPE_SOLID << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DEATH_FALL =COLLISION_TYPE_DEATH_FALL << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DESTRUCTABLE_FLOOR =COLLISION_TYPE_DESTRUCTABLE_FLOOR << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_DEATH_INSTANT =COLLISION_TYPE_DEATH_INSTANT << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_MOVE_LEFT =COLLISION_TYPE_MOVE_LEFT << COLLISION_TYPE_FLAG_SHIFT,
|
||||
COLLISION_TYPE_FLAG_MOVE_RIGHT =COLLISION_TYPE_MOVE_RIGHT << COLLISION_TYPE_FLAG_SHIFT,
|
||||
|
||||
COLLISION_TYPE_MASK = ((0xff<<COLLISION_TYPE_FLAG_SHIFT)&0xff),
|
||||
COLLISION_TILE_MASK = (0xff - COLLISION_TYPE_MASK)
|
||||
|
||||
COLLISION_TYPE_MASK = ((0xff<<COLLISION_TYPE_FLAG_SHIFT)&0xff),
|
||||
COLLISION_TILE_MASK = (0xff - COLLISION_TYPE_MASK)
|
||||
|
||||
};
|
||||
enum PSX_DATA_ENUM
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue