mirror of
https://github.com/TombEngine/TombEngine.git
synced 2025-04-28 15:57:59 +03:00
New RollingBall code update
This commit is contained in:
Adngel
parent
936457dab5
commit
7229702724
7 changed files with 156 additions and 315 deletions
|
|
@ -1,312 +0,0 @@
|
||||||
#include "framework.h"
|
|
||||||
#include "Objects/TR4/Trap/RollingBall.h"
|
|
||||||
|
|
||||||
#include "Game/animation.h"
|
|
||||||
#include "Game/camera.h"
|
|
||||||
#include "Game/collision/collide_item.h"
|
|
||||||
#include "Game/collision/sphere.h"
|
|
||||||
#include "Game/control/control.h"
|
|
||||||
#include "Game/effects/effects.h"
|
|
||||||
#include "Game/items.h"
|
|
||||||
#include "Game/Lara/lara.h"
|
|
||||||
#include "Game/Lara/lara_helpers.h"
|
|
||||||
#include "Game/Setup.h"
|
|
||||||
#include "Objects/Utils/VehicleHelpers.h"
|
|
||||||
#include "Sound/sound.h"
|
|
||||||
#include "Specific/level.h"
|
|
||||||
|
|
||||||
constexpr auto ROLLING_BALL_MAX_VELOCITY = BLOCK(3);
|
|
||||||
|
|
||||||
void RollingBallCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* coll)
|
|
||||||
{
|
|
||||||
auto* ballItem = &g_Level.Items[itemNumber];
|
|
||||||
|
|
||||||
if (!TestBoundsCollide(ballItem, laraItem, coll->Setup.Radius) ||
|
|
||||||
!TestCollision(ballItem, laraItem))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TriggerActive(ballItem) &&
|
|
||||||
(ballItem->ItemFlags[0] || ballItem->ItemFlags[1] || ballItem->Animation.Velocity.y))
|
|
||||||
{
|
|
||||||
laraItem->HitPoints = 0;
|
|
||||||
|
|
||||||
if (!laraItem->Animation.IsAirborne &&
|
|
||||||
!TestEnvironment(RoomEnvFlags::ENV_FLAG_WATER, laraItem))
|
|
||||||
{
|
|
||||||
SetAnimation(laraItem, LA_BOULDER_DEATH);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ObjectCollision(itemNumber, laraItem, coll);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void RollingBallControl(short itemNumber)
|
|
||||||
{
|
|
||||||
auto* item = &g_Level.Items[itemNumber];
|
|
||||||
|
|
||||||
if (!TriggerActive(item))
|
|
||||||
return;
|
|
||||||
|
|
||||||
auto oldPos = item->Pose;
|
|
||||||
|
|
||||||
bool isWater = TestEnvironment(RoomEnvFlags::ENV_FLAG_WATER, item->RoomNumber);
|
|
||||||
int hDivider = isWater ? 64 : 32;
|
|
||||||
int vDivider = isWater ? 3 : 1;
|
|
||||||
|
|
||||||
int smallRadius = CLICK(0.5f);
|
|
||||||
int bigRadius = CLICK(2) - 1;
|
|
||||||
|
|
||||||
item->Animation.Velocity.y += GRAVITY;
|
|
||||||
item->Pose.Position.x += item->ItemFlags[0] / hDivider;
|
|
||||||
item->Pose.Position.y += item->Animation.Velocity.y / vDivider;
|
|
||||||
item->Pose.Position.z += item->ItemFlags[1] / hDivider;
|
|
||||||
item->Animation.Velocity.z = Vector3i::Distance(item->Pose.Position, oldPos.Position);
|
|
||||||
|
|
||||||
int dh = GetCollision(item).Position.Floor - bigRadius;
|
|
||||||
|
|
||||||
if (item->Pose.Position.y > dh)
|
|
||||||
{
|
|
||||||
if (abs(item->Animation.Velocity.y) > 16.0f)
|
|
||||||
{
|
|
||||||
float distance = Vector3::Distance(item->Pose.Position.ToVector3(), Camera.pos.ToVector3());
|
|
||||||
if (distance < BLOCK(16))
|
|
||||||
{
|
|
||||||
if ((item->TriggerFlags & 1) != 1) // Flag 1 = silent.
|
|
||||||
{
|
|
||||||
Camera.bounce = -((BLOCK(16) - distance) * abs(item->Animation.Velocity.y)) / BLOCK(16);
|
|
||||||
SoundEffect(SFX_TR4_BOULDER_FALL, &item->Pose);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((item->Pose.Position.y - dh) < bigRadius)
|
|
||||||
item->Pose.Position.y = dh;
|
|
||||||
|
|
||||||
if (item->Animation.Velocity.y <= 64)
|
|
||||||
{
|
|
||||||
if (abs(item->Animation.Velocity.z) <= CLICK(2) || (GetRandomControl() & 0x1F))
|
|
||||||
item->Animation.Velocity.y = 0;
|
|
||||||
else
|
|
||||||
item->Animation.Velocity.y = -(GetRandomControl() % int(round(item->Animation.Velocity.z) / 8.0f));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
item->Animation.Velocity.y = -item->Animation.Velocity.y / 4.0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
int frontX = item->Pose.Position.x;
|
|
||||||
int frontZ = item->Pose.Position.z + smallRadius;
|
|
||||||
int backX = item->Pose.Position.x;
|
|
||||||
int backZ = item->Pose.Position.z - smallRadius;
|
|
||||||
int rightX = item->Pose.Position.x + smallRadius;
|
|
||||||
int rightZ = item->Pose.Position.z;
|
|
||||||
int leftX = item->Pose.Position.x - smallRadius;
|
|
||||||
int leftZ = item->Pose.Position.z;
|
|
||||||
|
|
||||||
auto frontFloor = GetCollision(frontX, item->Pose.Position.y, frontZ, item->RoomNumber);
|
|
||||||
auto backFloor = GetCollision(backX, item->Pose.Position.y, backZ, item->RoomNumber);
|
|
||||||
auto rightFloor = GetCollision(rightX, item->Pose.Position.y, rightZ, item->RoomNumber);
|
|
||||||
auto leftFloor = GetCollision(leftX, item->Pose.Position.y, leftZ, item->RoomNumber);
|
|
||||||
|
|
||||||
int frontHeight = frontFloor.Position.Floor - bigRadius;
|
|
||||||
int backHeight = backFloor.Position.Floor - bigRadius;
|
|
||||||
int rightHeight = rightFloor.Position.Floor - bigRadius;
|
|
||||||
int leftHeight = leftFloor.Position.Floor - bigRadius;
|
|
||||||
|
|
||||||
int frontCeiling = frontFloor.Position.Ceiling + bigRadius;
|
|
||||||
int backCeiling = backFloor.Position.Ceiling + bigRadius;
|
|
||||||
int rightCeiling = rightFloor.Position.Ceiling + bigRadius;
|
|
||||||
int leftCeiling = leftFloor.Position.Ceiling + bigRadius;
|
|
||||||
|
|
||||||
frontX = item->Pose.Position.x;
|
|
||||||
frontZ = item->Pose.Position.z + bigRadius;
|
|
||||||
backX = item->Pose.Position.x;
|
|
||||||
backZ = item->Pose.Position.z - bigRadius;
|
|
||||||
rightX = item->Pose.Position.x + bigRadius;
|
|
||||||
rightZ = item->Pose.Position.z;
|
|
||||||
leftX = item->Pose.Position.x - bigRadius;
|
|
||||||
leftZ = item->Pose.Position.z;
|
|
||||||
|
|
||||||
auto fronFarFloor = GetCollision(frontX, item->Pose.Position.y, frontZ, item->RoomNumber);
|
|
||||||
auto backFarFloor = GetCollision(backX, item->Pose.Position.y, backZ, item->RoomNumber);
|
|
||||||
auto rightFarFloor = GetCollision(rightX, item->Pose.Position.y, rightZ, item->RoomNumber);
|
|
||||||
auto leftFarFloor = GetCollision(leftX, item->Pose.Position.y, leftZ, item->RoomNumber);
|
|
||||||
|
|
||||||
int frontFarHeight = fronFarFloor.Position.Floor - bigRadius;
|
|
||||||
int backFarHeight = backFarFloor.Position.Floor - bigRadius;
|
|
||||||
int rightFarHeight = rightFarFloor.Position.Floor - bigRadius;
|
|
||||||
int leftFarHeight = leftFarFloor.Position.Floor - bigRadius;
|
|
||||||
|
|
||||||
int frontFarCeiling = fronFarFloor.Position.Ceiling + bigRadius;
|
|
||||||
int backFarCeiling = backFarFloor.Position.Ceiling + bigRadius;
|
|
||||||
int rightFarCeiling = rightFarFloor.Position.Ceiling + bigRadius;
|
|
||||||
int leftFarCeiling = leftFarFloor.Position.Ceiling + bigRadius;
|
|
||||||
|
|
||||||
if (item->Pose.Position.y - dh > -CLICK(1) ||
|
|
||||||
item->Pose.Position.y - frontFarHeight >= CLICK(2) ||
|
|
||||||
item->Pose.Position.y - rightFarHeight >= CLICK(2) ||
|
|
||||||
item->Pose.Position.y - backFarHeight >= CLICK(2) ||
|
|
||||||
item->Pose.Position.y - leftFarHeight >= CLICK(2))
|
|
||||||
{
|
|
||||||
int counterZ = 0;
|
|
||||||
|
|
||||||
if ((frontFarHeight - dh) <= CLICK(1))
|
|
||||||
{
|
|
||||||
if (frontFarHeight - dh < -CLICK(4) || frontHeight - dh < -CLICK(1))
|
|
||||||
{
|
|
||||||
if (item->ItemFlags[1] <= 0)
|
|
||||||
{
|
|
||||||
if (!item->ItemFlags[1] && item->ItemFlags[0])
|
|
||||||
item->Pose.Position.z = (item->Pose.Position.z & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
item->ItemFlags[1] = -item->ItemFlags[1] / 2;
|
|
||||||
item->Pose.Position.z = (item->Pose.Position.z & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (frontHeight == dh)
|
|
||||||
counterZ++;
|
|
||||||
else
|
|
||||||
item->ItemFlags[1] += (frontHeight - dh) / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (backHeight - dh <= CLICK(1))
|
|
||||||
{
|
|
||||||
if (backFarHeight - dh < -CLICK(4) || backHeight - dh < -CLICK(1))
|
|
||||||
{
|
|
||||||
if (item->ItemFlags[1] >= 0)
|
|
||||||
{
|
|
||||||
if (!item->ItemFlags[1] && item->ItemFlags[0])
|
|
||||||
item->Pose.Position.z = (item->Pose.Position.z & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
item->ItemFlags[1] = -item->ItemFlags[1] / 2;
|
|
||||||
item->Pose.Position.z = (item->Pose.Position.z & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (backHeight == dh)
|
|
||||||
counterZ++;
|
|
||||||
else
|
|
||||||
item->ItemFlags[1] -= (backHeight - dh) / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (counterZ == 2)
|
|
||||||
{
|
|
||||||
if (abs(item->ItemFlags[1]) <= 64)
|
|
||||||
item->ItemFlags[1] = 0;
|
|
||||||
else
|
|
||||||
item->ItemFlags[1] -= (item->ItemFlags[1] / 64);
|
|
||||||
}
|
|
||||||
|
|
||||||
int counterX = 0;
|
|
||||||
|
|
||||||
if ((leftHeight - dh) <= CLICK(1))
|
|
||||||
{
|
|
||||||
if ((leftFarHeight - dh) < -CLICK(4) || leftHeight - dh < -CLICK(1))
|
|
||||||
{
|
|
||||||
if (item->ItemFlags[0] >= 0)
|
|
||||||
{
|
|
||||||
if (!item->ItemFlags[0] && item->ItemFlags[1])
|
|
||||||
item->Pose.Position.x = (item->Pose.Position.x & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
item->ItemFlags[0] = -item->ItemFlags[0] / 2;
|
|
||||||
item->Pose.Position.x = (item->Pose.Position.x & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (leftHeight == dh)
|
|
||||||
counterX++;
|
|
||||||
else
|
|
||||||
item->ItemFlags[0] -= (leftHeight - dh) / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((rightHeight - dh) <= CLICK(1))
|
|
||||||
{
|
|
||||||
if ((rightFarHeight - dh) < -CLICK(4) || rightHeight - dh < -CLICK(1))
|
|
||||||
{
|
|
||||||
if (item->ItemFlags[0] <= 0)
|
|
||||||
{
|
|
||||||
if (!item->ItemFlags[0] && item->ItemFlags[1])
|
|
||||||
item->Pose.Position.x = (item->Pose.Position.x & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
item->ItemFlags[0] = -item->ItemFlags[0] / 2;
|
|
||||||
item->Pose.Position.x = (item->Pose.Position.x & ~(CLICK(4) - 1)) | CLICK(2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (rightHeight == dh)
|
|
||||||
counterX++;
|
|
||||||
else
|
|
||||||
item->ItemFlags[0] += (rightHeight - dh) / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (counterX == 2)
|
|
||||||
{
|
|
||||||
if (abs(item->ItemFlags[0]) <= 64)
|
|
||||||
item->ItemFlags[0] = 0;
|
|
||||||
else
|
|
||||||
item->ItemFlags[0] -= (item->ItemFlags[0] / 64);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto roomNumber = GetCollision(item).RoomNumber;
|
|
||||||
|
|
||||||
if (item->RoomNumber != roomNumber)
|
|
||||||
{
|
|
||||||
if (TestEnvironment(RoomEnvFlags::ENV_FLAG_WATER, roomNumber) &&
|
|
||||||
!TestEnvironment(RoomEnvFlags::ENV_FLAG_WATER, item->RoomNumber))
|
|
||||||
{
|
|
||||||
int waterHeight = GetWaterHeight(item->Pose.Position.x, item->Pose.Position.y, item->Pose.Position.z, roomNumber);
|
|
||||||
SplashSetup.y = waterHeight - 1;
|
|
||||||
SplashSetup.x = item->Pose.Position.x;
|
|
||||||
SplashSetup.z = item->Pose.Position.z;
|
|
||||||
SplashSetup.splashPower = item->Animation.Velocity.y * 4;
|
|
||||||
SplashSetup.innerRadius = 160;
|
|
||||||
SetupSplash(&SplashSetup, roomNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemNewRoom(itemNumber, roomNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (item->ItemFlags[0] > ROLLING_BALL_MAX_VELOCITY)
|
|
||||||
item->ItemFlags[0] = ROLLING_BALL_MAX_VELOCITY;
|
|
||||||
else if (item->ItemFlags[0] < -ROLLING_BALL_MAX_VELOCITY)
|
|
||||||
item->ItemFlags[0] = -ROLLING_BALL_MAX_VELOCITY;
|
|
||||||
|
|
||||||
if (item->ItemFlags[1] > ROLLING_BALL_MAX_VELOCITY)
|
|
||||||
item->ItemFlags[1] = ROLLING_BALL_MAX_VELOCITY;
|
|
||||||
else if (item->ItemFlags[1] < -ROLLING_BALL_MAX_VELOCITY)
|
|
||||||
item->ItemFlags[1] = -ROLLING_BALL_MAX_VELOCITY;
|
|
||||||
|
|
||||||
short angle = 0;
|
|
||||||
|
|
||||||
if (item->ItemFlags[1] || item->ItemFlags[0])
|
|
||||||
angle = phd_atan(item->ItemFlags[1], item->ItemFlags[0]);
|
|
||||||
else
|
|
||||||
angle = item->Pose.Orientation.y;
|
|
||||||
|
|
||||||
if (item->Pose.Orientation.y != angle)
|
|
||||||
{
|
|
||||||
if (((angle - item->Pose.Orientation.y) & 0x7fff) >= 512)
|
|
||||||
{
|
|
||||||
if (angle <= item->Pose.Orientation.y || angle - item->Pose.Orientation.y >= 0x8000)
|
|
||||||
item->Pose.Orientation.y -= CLICK(2);
|
|
||||||
else
|
|
||||||
item->Pose.Orientation.y += CLICK(2);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
item->Pose.Orientation.y = angle;
|
|
||||||
}
|
|
||||||
|
|
||||||
item->Pose.Orientation.x -= ((abs(item->ItemFlags[0]) + abs(item->ItemFlags[1])) / 2) / vDivider;
|
|
||||||
|
|
||||||
TestTriggers(item, true);
|
|
||||||
DoVehicleCollision(item, bigRadius * 0.9f);
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
#include "framework.h"
|
||||||
|
#include "Objects/TR4/Trap/RollingBall/RollingBallInfo.h"
|
||||||
21
TombEngine/Objects/TR4/Trap/RollingBall/RollingBallInfo.h
Normal file
21
TombEngine/Objects/TR4/Trap/RollingBall/RollingBallInfo.h
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Math/Math.h"
|
||||||
|
|
||||||
|
//TODO: Is this namespace correct?
|
||||||
|
namespace TEN::Entities::Generic
|
||||||
|
{
|
||||||
|
|
||||||
|
struct RollingBallInfo
|
||||||
|
{
|
||||||
|
int radius = BLOCK(0.5f);
|
||||||
|
bool isOnGround = true;
|
||||||
|
|
||||||
|
short energy_movement = 0;
|
||||||
|
short energy_bounce = 0;
|
||||||
|
float speed;
|
||||||
|
|
||||||
|
Vector3 movementVector;
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
128
TombEngine/Objects/TR4/Trap/RollingBall/RollingBallObject.cpp
Normal file
128
TombEngine/Objects/TR4/Trap/RollingBall/RollingBallObject.cpp
Normal file
|
|
@ -0,0 +1,128 @@
|
||||||
|
#include "framework.h"
|
||||||
|
#include "Objects/TR4/Trap/RollingBall/RollingBallObject.h"
|
||||||
|
|
||||||
|
#include "Game/collision/collide_item.h"
|
||||||
|
#include "Game/collision/sphere.h"
|
||||||
|
#include "Game/effects/effects.h"
|
||||||
|
#include "Objects/TR4/Trap/RollingBall/RollingBallInfo.h"
|
||||||
|
#include "Specific/level.h"
|
||||||
|
|
||||||
|
constexpr auto ROLLING_BALL_MAX_VELOCITY = BLOCK(3);
|
||||||
|
constexpr auto FLOOR_HEIGHT_TOLERANCE = 32;
|
||||||
|
|
||||||
|
RollingBallInfo& GetRollingBallInfo(const ItemInfo& item)
|
||||||
|
{
|
||||||
|
return (RollingBallInfo&)item.Data;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void SpawnRollingBallWaterSplash(ItemInfo& item, int roomNumber)
|
||||||
|
{
|
||||||
|
int waterHeight = GetWaterHeight(item.Pose.Position.x, item.Pose.Position.y, item.Pose.Position.z, roomNumber);
|
||||||
|
SplashSetup.y = waterHeight - 1;
|
||||||
|
SplashSetup.x = item.Pose.Position.x;
|
||||||
|
SplashSetup.z = item.Pose.Position.z;
|
||||||
|
SplashSetup.splashPower = item.Animation.Velocity.y * 4;
|
||||||
|
SplashSetup.innerRadius = 160;
|
||||||
|
SetupSplash(&SplashSetup, roomNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void RollingBallUpdateRoom(ItemInfo& item)
|
||||||
|
{
|
||||||
|
auto roomNumber = GetCollision(item).RoomNumber;
|
||||||
|
if (item.RoomNumber != roomNumber)
|
||||||
|
{
|
||||||
|
if (TestEnvironment(RoomEnvFlags::ENV_FLAG_WATER, roomNumber) &&
|
||||||
|
!TestEnvironment(RoomEnvFlags::ENV_FLAG_WATER, item.RoomNumber))
|
||||||
|
{
|
||||||
|
SpawnRollingBallWaterSplash(item, roomNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemNewRoom(item.Index, roomNumber);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void CheckOnGround(ItemInfo& rollingBallItem, RollingBallInfo& rollingBall)
|
||||||
|
{
|
||||||
|
int floorDist = abs(rollingBallItem.Pose.Position.y - GetCollision(rollingBallItem).Position.Floor);
|
||||||
|
rollingBall.isOnGround = (floorDist < rollingBall.radius + FLOOR_HEIGHT_TOLERANCE) ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void RollingBallGroundMovement(ItemInfo& rollingBallItem, RollingBallInfo& rollingBall)
|
||||||
|
{
|
||||||
|
//Calculate new movement vector
|
||||||
|
Vector3 direction = Vector3::Zero;
|
||||||
|
|
||||||
|
//It must do it checking the ground normal, and the movementVector stored in the rollingBall struct.
|
||||||
|
//(movementVector is the current velocity that the ball is having)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static void RollingBallAirMovement(ItemInfo& item)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static void RollingBallRotation(ItemInfo& item)
|
||||||
|
{
|
||||||
|
//Rotate Pan, Yaw and Roll depending of the movement vector and speed.
|
||||||
|
}
|
||||||
|
|
||||||
|
void RollingBallControl(short itemNumber)
|
||||||
|
{
|
||||||
|
auto& rollingBallItem = g_Level.Items[itemNumber];
|
||||||
|
auto& rollingBall = GetRollingBallInfo(rollingBallItem);
|
||||||
|
|
||||||
|
if (!TriggerActive(&rollingBallItem))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (rollingBall.energy_movement > 0)
|
||||||
|
{
|
||||||
|
CheckOnGround(rollingBallItem, rollingBall);
|
||||||
|
|
||||||
|
if (rollingBall.isOnGround)
|
||||||
|
{
|
||||||
|
RollingBallGroundMovement(rollingBallItem, rollingBall);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RollingBallAirMovement(rollingBallItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
RollingBallRotation(rollingBallItem);
|
||||||
|
RollingBallUpdateRoom(rollingBallItem);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//rest
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void RollingBallCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* coll)
|
||||||
|
{
|
||||||
|
auto& item = g_Level.Items[itemNumber];
|
||||||
|
|
||||||
|
if (!TestBoundsCollide(&item, laraItem, coll->Setup.Radius) ||
|
||||||
|
!TestCollision(&item, laraItem))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TriggerActive(&item) &&
|
||||||
|
(item.ItemFlags[0] || item.ItemFlags[1] || item.Animation.Velocity.y))
|
||||||
|
{
|
||||||
|
laraItem->HitPoints = 0;
|
||||||
|
|
||||||
|
if (!laraItem->Animation.IsAirborne &&
|
||||||
|
!TestEnvironment(RoomEnvFlags::ENV_FLAG_WATER, laraItem))
|
||||||
|
{
|
||||||
|
SetAnimation(laraItem, LA_BOULDER_DEATH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ObjectCollision(itemNumber, laraItem, coll);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
// Switches
|
// Switches
|
||||||
|
|
||||||
// Traps
|
// Traps
|
||||||
#include "Objects/TR4/Trap/RollingBall.h"
|
#include "Objects/TR4/Trap/Rollingball/RollingBallObject.h"
|
||||||
#include "Objects/TR4/Trap/SpikyCeiling.h"
|
#include "Objects/TR4/Trap/SpikyCeiling.h"
|
||||||
#include "Objects/TR4/Trap/SpikyWall.h"
|
#include "Objects/TR4/Trap/SpikyWall.h"
|
||||||
#include "Objects/TR4/Trap/tr4_birdblade.h"
|
#include "Objects/TR4/Trap/tr4_birdblade.h"
|
||||||
|
|
|
||||||
|
|
@ -589,7 +589,8 @@ xcopy /Y "$(SolutionDir)Libs\zlib\x64\*.dll" "$(TargetDir)"</Command>
|
||||||
<ClInclude Include="Objects\TR4\Object\tr4_sarcophagus.h" />
|
<ClInclude Include="Objects\TR4\Object\tr4_sarcophagus.h" />
|
||||||
<ClInclude Include="Objects\TR4\Object\tr4_scales.h" />
|
<ClInclude Include="Objects\TR4\Object\tr4_scales.h" />
|
||||||
<ClInclude Include="Objects\TR4\Object\tr4_senet.h" />
|
<ClInclude Include="Objects\TR4\Object\tr4_senet.h" />
|
||||||
<ClInclude Include="Objects\TR4\Trap\RollingBall.h" />
|
<ClInclude Include="Objects\TR4\Trap\RollingBall\RollingBallInfo.h" />
|
||||||
|
<ClInclude Include="Objects\TR4\Trap\RollingBall\RollingBallObject.h" />
|
||||||
<ClInclude Include="Objects\TR4\Trap\SpikyCeiling.h" />
|
<ClInclude Include="Objects\TR4\Trap\SpikyCeiling.h" />
|
||||||
<ClInclude Include="Objects\TR4\Trap\SpikyWall.h" />
|
<ClInclude Include="Objects\TR4\Trap\SpikyWall.h" />
|
||||||
<ClInclude Include="Objects\TR4\Trap\tr4_birdblade.h" />
|
<ClInclude Include="Objects\TR4\Trap\tr4_birdblade.h" />
|
||||||
|
|
@ -1087,7 +1088,8 @@ xcopy /Y "$(SolutionDir)Libs\zlib\x64\*.dll" "$(TargetDir)"</Command>
|
||||||
<ClCompile Include="Objects\TR4\Object\tr4_senet.cpp" />
|
<ClCompile Include="Objects\TR4\Object\tr4_senet.cpp" />
|
||||||
<ClCompile Include="Objects\TR4\Object\WraithTrap.cpp" />
|
<ClCompile Include="Objects\TR4\Object\WraithTrap.cpp" />
|
||||||
<ClCompile Include="Objects\TR4\tr4_objects.cpp" />
|
<ClCompile Include="Objects\TR4\tr4_objects.cpp" />
|
||||||
<ClCompile Include="Objects\TR4\Trap\RollingBall.cpp" />
|
<ClCompile Include="Objects\TR4\Trap\RollingBall\RollingBallInfo.cpp" />
|
||||||
|
<ClCompile Include="Objects\TR4\Trap\RollingBall\RollingBallObject.cpp" />
|
||||||
<ClCompile Include="Objects\TR4\Trap\SpikyCeiling.cpp" />
|
<ClCompile Include="Objects\TR4\Trap\SpikyCeiling.cpp" />
|
||||||
<ClCompile Include="Objects\TR4\Trap\SpikyWall.cpp" />
|
<ClCompile Include="Objects\TR4\Trap\SpikyWall.cpp" />
|
||||||
<ClCompile Include="Objects\TR4\Trap\tr4_birdblade.cpp" />
|
<ClCompile Include="Objects\TR4\Trap\tr4_birdblade.cpp" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue