Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-06 19:01:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove obsolete constants

Browse source
This commit is contained in:
Lwmte 2021-09-13 03:11:13 +03:00
parent 8ddab16e6a
commit cf76de4b90
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TR5Main/Game/Box.h
View file

@ -159,7 +159,6 @@ struct EntityStoringInfo
};
#define CreatureEffectFunction short(int x, int y, int z, short speed, short yRot, short roomNumber)
//#define XZ_GET_SECTOR(room, x, z) (room->floor[(z) / SECTOR(1) + (x) / SECTOR(1) * room->xSize])
constexpr auto UNIT_SHADOW = 256;
constexpr auto NO_SHADOW = 0;
@ -172,9 +171,6 @@ constexpr auto BOX_LAST = (1 << 15); // unpassable by large enemies (T-Rex, Cent
constexpr auto TIMID = 0;
constexpr auto VIOLENT = 1;
constexpr auto ONESHOT = 0x100;
constexpr auto DATA_TYPE = 0x1F;
constexpr auto DATA_TILT = 0xF; // tile type (FLOOR_TYPE enum)
constexpr auto DATA_STATIC = 0xFF; // probably add static collision
constexpr auto END_BIT = 0x8000;
constexpr auto VALUE_BITS = 0x3FF;
constexpr auto CODE_BITS = 0x3E00;
@ -204,7 +200,6 @@ constexpr auto CLIP_TOP = 0x4;
constexpr auto CLIP_BOTTOM = 0x8;
constexpr auto SECONDARY_CLIP = 0x10;
constexpr auto ALL_CLIP = (CLIP_LEFT | CLIP_RIGHT | CLIP_TOP | CLIP_BOTTOM);
constexpr auto SLOPE_DIF = 60;
void GetCreatureMood(ITEM_INFO* item, AI_INFO* info, int violent);
void CreatureMood(ITEM_INFO* item, AI_INFO* info, int violent);

3
TR5Main/Game/Lara/lara_tests.cpp
View file

@ -901,7 +901,6 @@ int LaraTestHangOnClimbWall(ITEM_INFO* item, COLL_INFO* coll)
int LaraTestEdgeCatch(ITEM_INFO* item, COLL_INFO* coll, int* edge)
{
BOUNDING_BOX* bounds = GetBoundsAccurate(item);
int hdif = coll->Front.Floor - bounds->Y1;
@ -922,7 +921,7 @@ int LaraTestEdgeCatch(ITEM_INFO* item, COLL_INFO* coll, int* edge)
return 0;
}
if (abs(coll->FrontLeft.Floor - coll->FrontRight.Floor) >= SLOPE_DIF)
if (abs(coll->FrontLeft.Floor - coll->FrontRight.Floor) >= SLOPE_DIFFERENCE)
return 0;
return 1;

1
TR5Main/Specific/trmath.h
View file

@ -23,6 +23,7 @@ constexpr auto STEP_SIZE = WALL_SIZE / 4;
constexpr auto STOP_SIZE = WALL_SIZE / 2;
constexpr auto STEPUP_HEIGHT = ((STEP_SIZE * 3) / 2);
constexpr auto BAD_JUMP_CEILING = ((STEP_SIZE * 3) / 4);
constexpr auto SLOPE_DIFFERENCE = 60;
constexpr auto NO_HEIGHT = (-0x7F00);
constexpr auto MAX_HEIGHT = (-0x7FFF);