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

Move TR2 creatures into more appropriate namespace

Browse source
This commit is contained in:
Sezz 2022-08-21 15:20:13 +10:00
parent 658498d17b
commit deca190af5
39 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TombEngine/Objects/TR2/Entity/tr2_barracuda.cpp
View file

@ -12,7 +12,7 @@
using std::vector;
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
constexpr auto BARRACUDA_ATTACK_DAMAGE = 100;
constexpr auto BARRACUDA_IDLE_ATTACK_RANGE = SQUARE(SECTOR(0.67f));

2
TombEngine/Objects/TR2/Entity/tr2_barracuda.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void BarracudaControl(short itemNumber);
}

2
TombEngine/Objects/TR2/Entity/tr2_bird_monster.cpp
View file

@ -14,7 +14,7 @@
using namespace TEN::Math::Random;
using std::vector;
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
constexpr auto BIRD_MONSTER_ATTACK_DAMAGE = 200;
constexpr auto BIRD_MONSTER_SLAM_CRUSH_ATTACK_RANGE = SQUARE(SECTOR(1));

2
TombEngine/Objects/TR2/Entity/tr2_bird_monster.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void BirdMonsterControl(short itemNumber);
}

2
TombEngine/Objects/TR2/Entity/tr2_dragon.cpp
View file

@ -20,7 +20,7 @@
using namespace TEN::Input;
using std::vector;
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
constexpr auto DRAGON_SWIPE_ATTACK_DAMAGE = 250;
constexpr auto DRAGON_CONTACT_DAMAGE = 10;

2
TombEngine/Objects/TR2/Entity/tr2_dragon.h
View file

@ -2,7 +2,7 @@
#include "Game/collision/collide_room.h"
#include "Game/items.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void DragonCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* coll);
void DragonControl(short backNumber);

2
TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.cpp
View file

@ -10,7 +10,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto EagleBite = BiteInfo(Vector3(15.0f, 46.0f, 21.0f), 6);
const auto CrowBite = BiteInfo(Vector3(2.0f, 10.0f, 60.0f), 14);

2
TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseEagle(short itemNumber);
void EagleControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_knife_thrower.cpp
View file

@ -18,7 +18,7 @@
using namespace TEN::Math::Random;
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
constexpr auto KNIFE_PROJECTILE_DAMAGE = 50;

2
TombEngine/Objects/TR2/Entity/tr2_knife_thrower.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void KnifeControl(short fxNumber);
void KnifeThrowerControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_mercenary.cpp
View file

@ -11,7 +11,7 @@
#include "Specific/setup.h"
#include "Specific/trmath.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto MercenaryUziBite = BiteInfo(Vector3(0.0f, 150.0f, 19.0f), 17);
const auto MercenaryAutoPistolBite = BiteInfo(Vector3(0.0f, 230.0f, 9.0f), 17);

2
TombEngine/Objects/TR2/Entity/tr2_mercenary.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void MercenaryUziControl(short itemNumber);
void MercenaryAutoPistolControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_monk.cpp
View file

@ -11,7 +11,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto MonkBite = BiteInfo(Vector3(-23.0f, 16.0f, 265.0f), 14);

2
TombEngine/Objects/TR2/Entity/tr2_monk.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void MonkControl(short itemNumber);
}

2
TombEngine/Objects/TR2/Entity/tr2_rat.cpp
View file

@ -14,7 +14,7 @@
using namespace TEN::Math::Random;
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
constexpr auto RAT_ATTACK_DAMAGE = 20;
constexpr auto RAT_ATTACK_RANGE = SQUARE(CLICK(0.7f));

2
TombEngine/Objects/TR2/Entity/tr2_rat.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void RatControl(short itemNumber);
}

2
TombEngine/Objects/TR2/Entity/tr2_shark.cpp
View file

@ -11,7 +11,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto SharkBite = BiteInfo(Vector3(17.0f, -22.0f, 344.0f), 12);

2
TombEngine/Objects/TR2/Entity/tr2_shark.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void SharkControl(short itemNumber);
}

2
TombEngine/Objects/TR2/Entity/tr2_silencer.cpp
View file

@ -10,7 +10,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto SilencerGunBite = BiteInfo(Vector3(3.0f, 331.0f, 56.0f), 10);

2
TombEngine/Objects/TR2/Entity/tr2_silencer.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void SilencerControl(short itemNumber);
}

2
TombEngine/Objects/TR2/Entity/tr2_skidman.cpp
View file

@ -17,7 +17,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
#define SMAN_MIN_TURN (ANGLE(2.0f))
#define SMAN_TARGET_ANGLE ANGLE(15.0f)

2
TombEngine/Objects/TR2/Entity/tr2_skidman.h
View file

@ -2,7 +2,7 @@
#include "Game/collision/collide_room.h"
#include "Game/items.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseSkidooMan(short itemNumber);
void SkidooManCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* coll);

2
TombEngine/Objects/TR2/Entity/tr2_spear_guardian.cpp
View file

@ -12,7 +12,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto SpearBiteLeft = BiteInfo(Vector3(0.0f, 0.0f, 920.0f), 11);
const auto SpearBiteRight = BiteInfo(Vector3(0.0f, 0.0f, 920.0f), 18);

2
TombEngine/Objects/TR2/Entity/tr2_spear_guardian.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseSpearGuardian(short itemNumber);
void SpearGuardianControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_spider.cpp
View file

@ -14,7 +14,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto SpiderBite = BiteInfo(Vector3(0.0f, 0.0f, 41.0f), 1);

2
TombEngine/Objects/TR2/Entity/tr2_spider.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void SmallSpiderControl(short itemNumber);
void BigSpiderControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_sword_guardian.cpp
View file

@ -13,7 +13,7 @@
#include "Sound/sound.h"
#include "Specific/level.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto SwordBite = BiteInfo(Vector3(0.0f, 37.0f, 550.0f), 15);

2
TombEngine/Objects/TR2/Entity/tr2_sword_guardian.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseSwordGuardian(short itemNumber);
void SwordGuardianControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp
View file

@ -10,7 +10,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto WorkerDualGunBiteLeft = BiteInfo(Vector3(-2.0f, 275.0f, 23.0f), 6);
const auto WorkerDualGunBiteRight = BiteInfo(Vector3(2.0f, 275.0f, 23.0f), 10);

2
TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void WorkerDualGunControl(short itemNumber);
}

2
TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
View file

@ -16,7 +16,7 @@
#include "Specific/level.h"
#include "Specific/trmath.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto WorkerFlamethrowerOffset = Vector3Int(0, 140, 0);
const auto WorkerFlamethrowerBite = BiteInfo(Vector3(0.0f, 250.0f, 32.0f), 9);

2
TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseWorkerFlamethrower(short itemNumber);
void WorkerFlamethrower(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.cpp
View file

@ -11,7 +11,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto WorkerMachineGunBite = BiteInfo(Vector3(0.0f, 308.0f, 32.0f), 9);

2
TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseWorkerMachineGun(short itemNumber);
void WorkerMachineGunControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.cpp
View file

@ -12,7 +12,7 @@
#include "Specific/level.h"
#include "Specific/setup.h"
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto WorkerShotgunBite = BiteInfo(Vector3(0.0f, 281.0f, 40.0f), 9);

2
TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseWorkerShotgun(short itemNumber);
void WorkerShotgunControl(short itemNumber);

2
TombEngine/Objects/TR2/Entity/tr2_yeti.cpp
View file

@ -15,7 +15,7 @@
using namespace TEN::Math::Random;
using std::vector;
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
const auto YetiBiteLeft = BiteInfo(Vector3(12.0f, 101.0f, 19.0f), 13);
const auto YetiBiteRight = BiteInfo(Vector3(12.0f, 101.0f, 19.0f), 10);

2
TombEngine/Objects/TR2/Entity/tr2_yeti.h
View file

@ -1,6 +1,6 @@
#pragma once
namespace TEN::Entities::TR2
namespace TEN::Entities::Creatures::TR2
{
void InitialiseYeti(short itemNumber);
void YetiControl(short itemNumber);

2
TombEngine/Objects/TR2/tr2_objects.cpp
View file

@ -37,7 +37,7 @@
#include "Objects/TR2/Vehicles/speedboat.h"
#include "Objects/TR2/Vehicles/skidoo.h"
using namespace TEN::Entities::TR2;
using namespace TEN::Entities::Creatures::TR2;
static void StartEntity(ObjectInfo* obj)
{