Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rollback MovingLaserFlags rename, bump version number

Browse source
This commit is contained in:
Lwmte 2025-03-23 08:24:36 +01:00
parent 382b9d1ef5
commit ac77c5f9ad
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
TombEngine/Objects/TR5/Trap/MovingLaser.cpp
View file

@ -23,7 +23,7 @@ namespace TEN::Entities::Traps
constexpr auto MOVING_LASER_ACCEL = 1.0f; constexpr auto MOVING_LASER_ACCEL = 1.0f;
constexpr auto MOVING_LASER_PAUSE_FRAME_COUNT = 30; constexpr auto MOVING_LASER_PAUSE_FRAME_COUNT = 30;
enum class MovingLaserProperty enum class MovingLaserFlags
{ {
Velocity, Velocity,
PauseTimer, PauseTimer,
@ -35,8 +35,8 @@ namespace TEN::Entities::Traps
void InitializeMovingLaser(short itemNumber) void InitializeMovingLaser(short itemNumber)
{ {
auto& item = g_Level.Items[itemNumber]; auto& item = g_Level.Items[itemNumber];
item.ItemFlags[(int)MovingLaserProperty::DirectionSign] = 1; item.ItemFlags[(int)MovingLaserFlags::DirectionSign] = 1;
item.ItemFlags[(int)MovingLaserProperty::Velocity] = 10; item.ItemFlags[(int)MovingLaserFlags::Velocity] = 10;
// Offset by 1/4 block to make it dangerous at sector edges. // Offset by 1/4 block to make it dangerous at sector edges.
item.Pose.Translate(item.Pose.Orientation, -BLOCK(0.25f)); item.Pose.Translate(item.Pose.Orientation, -BLOCK(0.25f));
@ -51,7 +51,7 @@ namespace TEN::Entities::Traps
// Calculate distances. // Calculate distances.
float moveDist = BLOCK(item.TriggerFlags) + BLOCK(0.5f); float moveDist = BLOCK(item.TriggerFlags) + BLOCK(0.5f);
float distPerFrame = (BLOCK(item.ItemFlags[(int)MovingLaserProperty::Velocity]) * 0.25f) / (float)FPS; float distPerFrame = (BLOCK(item.ItemFlags[(int)MovingLaserFlags::Velocity]) * 0.25f) / (float)FPS;
item.Animation.ActiveState = 0; item.Animation.ActiveState = 0;
@ -74,38 +74,38 @@ namespace TEN::Entities::Traps
return; return;
} }
if (item.ItemFlags[(int)MovingLaserProperty::PauseTimer] > 0) if (item.ItemFlags[(int)MovingLaserFlags::PauseTimer] > 0)
{ {
item.ItemFlags[(int)MovingLaserProperty::PauseTimer]--; item.ItemFlags[(int)MovingLaserFlags::PauseTimer]--;
if (item.ItemFlags[(int)MovingLaserProperty::PauseTimer] == 0) if (item.ItemFlags[(int)MovingLaserFlags::PauseTimer] == 0)
{ {
item.ItemFlags[(int)MovingLaserProperty::DirectionSign] *= -1; item.ItemFlags[(int)MovingLaserFlags::DirectionSign] *= -1;
item.ItemFlags[(int)MovingLaserProperty::DistanceTraveled] = 0; item.ItemFlags[(int)MovingLaserFlags::DistanceTraveled] = 0;
} }
AnimateItem(&item); AnimateItem(&item);
return; return;
} }
item.Pose.Translate(item.Pose.Orientation, (item.ItemFlags[(int)MovingLaserProperty::DirectionSign] * item.ItemFlags[(int)MovingLaserProperty::VelocityCalc])); item.Pose.Translate(item.Pose.Orientation, (item.ItemFlags[(int)MovingLaserFlags::DirectionSign] * item.ItemFlags[(int)MovingLaserFlags::VelocityCalc]));
item.ItemFlags[(int)MovingLaserProperty::DistanceTraveled] += item.ItemFlags[(int)MovingLaserProperty::VelocityCalc]; item.ItemFlags[(int)MovingLaserFlags::DistanceTraveled] += item.ItemFlags[(int)MovingLaserFlags::VelocityCalc];
if (item.ItemFlags[(int)MovingLaserProperty::DistanceTraveled] < (moveDist - BLOCK(0.5f))) if (item.ItemFlags[(int)MovingLaserFlags::DistanceTraveled] < (moveDist - BLOCK(0.5f)))
{ {
item.ItemFlags[(int)MovingLaserProperty::VelocityCalc] = std::min(distPerFrame, item.ItemFlags[(int)MovingLaserProperty::VelocityCalc] + MOVING_LASER_ACCEL); item.ItemFlags[(int)MovingLaserFlags::VelocityCalc] = std::min(distPerFrame, item.ItemFlags[(int)MovingLaserFlags::VelocityCalc] + MOVING_LASER_ACCEL);
} }
else else
{ {
item.ItemFlags[(int)MovingLaserProperty::VelocityCalc] = std::max(MOVING_LASER_VELOCITY_MIN, item.ItemFlags[(int)MovingLaserProperty::VelocityCalc] - MOVING_LASER_ACCEL); item.ItemFlags[(int)MovingLaserFlags::VelocityCalc] = std::max(MOVING_LASER_VELOCITY_MIN, item.ItemFlags[(int)MovingLaserFlags::VelocityCalc] - MOVING_LASER_ACCEL);
} }
if (item.ItemFlags[(int)MovingLaserProperty::DistanceTraveled] >= moveDist) if (item.ItemFlags[(int)MovingLaserFlags::DistanceTraveled] >= moveDist)
{ {
item.ItemFlags[(int)MovingLaserProperty::PauseTimer] = MOVING_LASER_PAUSE_FRAME_COUNT; item.ItemFlags[(int)MovingLaserFlags::PauseTimer] = MOVING_LASER_PAUSE_FRAME_COUNT;
} }
if (item.ItemFlags[(int)MovingLaserProperty::PauseTimer] == 0) if (item.ItemFlags[(int)MovingLaserFlags::PauseTimer] == 0)
{ {
SoundEffect(SFX_TR5_MOVING_LASER_LOOP, &item.Pose, SoundEnvironment::Always); SoundEffect(SFX_TR5_MOVING_LASER_LOOP, &item.Pose, SoundEnvironment::Always);
} }

4
TombEngine/version.h
View file

@ -2,12 +2,12 @@
#define TE_MAJOR_VERSION 1 #define TE_MAJOR_VERSION 1
#define TE_MINOR_VERSION 8 #define TE_MINOR_VERSION 8
#define TE_BUILD_NUMBER 0 #define TE_BUILD_NUMBER 1
#define TE_REVISION_NUMBER 0 #define TE_REVISION_NUMBER 0
#define TEN_MAJOR_VERSION 1 #define TEN_MAJOR_VERSION 1
#define TEN_MINOR_VERSION 8 #define TEN_MINOR_VERSION 8
#define TEN_BUILD_NUMBER 0 #define TEN_BUILD_NUMBER 1
#define TEN_REVISION_NUMBER 0 #define TEN_REVISION_NUMBER 0
#define TEST_BUILD 1 #define TEST_BUILD 1