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

Cleanup

Browse source
This commit is contained in:
Lwmte 2021-09-25 16:00:30 +03:00
parent b7cf7be08c
commit e6fc5aba77
245 changed files with 280 additions and 556 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Game/Lara/lara.cpp
View file

@ -39,7 +39,7 @@
#include "control\volume.h"
#include "Renderer11.h"
#include "camera.h"
#include "item.h"
#include "items.h"
#ifdef NEW_INV
#include "newinv2.h"

1
TR5Main/Game/Lara/lara_basic.cpp
View file

@ -14,7 +14,6 @@
#include "collide.h"
#include "items.h"
#include "camera.h"
#include "item.h"
/*generic functions*/
void lara_void_func(ITEM_INFO* item, COLL_INFO* coll)

1
TR5Main/Game/Lara/lara_cheat.cpp
View file

@ -12,7 +12,6 @@
#include "items.h"
#include "setup.h"
#include "level.h"
#include "item.h"
int NoCheatCounter;

2
TR5Main/Game/Lara/lara_climb.cpp
View file

@ -7,7 +7,7 @@
#include "camera.h"
#include "level.h"
#include "input.h"
#include "item.h"
#include "items.h"
CLIMB_DIRECTION LeftIntRightExtTab[4] =
{

2
TR5Main/Game/Lara/lara_collide.cpp
View file

@ -7,7 +7,7 @@
#include "collide.h"
#include "control/control.h"
#include "lara_collide.h"
#include "item.h"
#include "items.h"
/*this file has all the generic **collision** test functions called in lara's state code*/

1
TR5Main/Game/Lara/lara_crawl.cpp
View file

@ -11,7 +11,6 @@
#include "items.h"
#include "camera.h"
#include "control/control.h"
#include "item.h"
/*this file has all the related functions to ducking and crawling*/

9
TR5Main/Game/Lara/lara_fire.cpp
View file

@ -6,21 +6,20 @@
#include "lara_two_guns.h"
#include "camera.h"
#include "objects.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "sphere.h"
#include "animation.h"
#include "effects\flmtorch.h"
#include "effects/flmtorch.h"
#include "level.h"
#include "control/lot.h"
#include "setup.h"
#include "input.h"
#include "Sound\sound.h"
#include "control\los.h"
#include "Sound/sound.h"
#include "control/los.h"
#include "savegame.h"
#include "GameFlowScript.h"
#include "lara_struct.h"
#include "itemdata/creature_info.h"
#include "item.h"
WEAPON_INFO Weapons[NUM_WEAPONS] =
{

10
TR5Main/Game/Lara/lara_flare.cpp
View file

@ -2,17 +2,15 @@
#include "lara_flare.h"
#include "level.h"
#include "setup.h"
#include "Sound\sound.h"
#include "Sound/sound.h"
#include "animation.h"
#include "items.h"
#include "sphere.h"
#include "lara_fire.h"
#include "Lara.h"
#include "collide.h"
#include "effects\effects.h"
#include "effects\chaffFX.h"
#include "Specific\prng.h"
#include "item.h"
#include "effects/effects.h"
#include "effects/chaffFX.h"
#include "Specific/prng.h"
constexpr std::array<float, 28> FlareFlickerTable = { 0.7590,0.9880,0.8790,0.920,0.8020,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.84642,0.7896,0.817634,0.923424,0.7589,0.81399,0.92834,0.9978,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.74642 };
constexpr DirectX::SimpleMath::Vector3 FlareMainColor = Vector3(1,0.52947, 0.3921);

1
TR5Main/Game/Lara/lara_hang.cpp
View file

@ -6,7 +6,6 @@
#include "collide.h"
#include "camera.h"
#include "level.h"
#include "item.h"
/*this file has all the lara_as/lara_col functions related to hanging*/

1
TR5Main/Game/Lara/lara_initialise.cpp
View file

@ -5,7 +5,6 @@
#include "items.h"
#include "setup.h"
#include "level.h"
#include "item.h"
void InitialiseLara(int restore)
{

2
TR5Main/Game/Lara/lara_monkey.cpp
View file

@ -9,9 +9,7 @@
#include "collide.h"
#include "items.h"
#include "camera.h"
#include "control/control.h"
#include "level.h"
#include "item.h"
using namespace TEN::Floordata;

1
TR5Main/Game/Lara/lara_objects.cpp
View file

@ -9,7 +9,6 @@
#include "collide.h"
#include "items.h"
#include "control/control.h"
#include "item.h"
/*This file has "all" lara_as/lara_col functions where Lara is interacting with an object.*/

18
TR5Main/Game/Lara/lara_one_gun.cpp
View file

@ -6,28 +6,22 @@
#include "animation.h"
#include "control/box.h"
#include "control/control.h"
#include "effects\effects.h"
#include "effects\tomb4fx.h"
#include "control/lot.h"
#include "effects/effects.h"
#include "effects/tomb4fx.h"
#include "collide.h"
#include "effects\debris.h"
#include "effects\weather.h"
#include "effects/debris.h"
#include "effects/weather.h"
#include "lara_two_guns.h"
#include "switch.h"
#include "objects.h"
#include "sphere.h"
#include "traps.h"
#include "camera.h"
#include "GameFlowScript.h"
#include "level.h"
#include "setup.h"
#include "input.h"
#include "savegame.h"
#include "Sound\sound.h"
#include "effects\bubble.h"
#include "Sound/sound.h"
#include "effects/bubble.h"
#include "generic_switch.h"
#include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire;
using namespace TEN::Entities::Switches;

2
TR5Main/Game/Lara/lara_slide.cpp
View file

@ -7,7 +7,7 @@
#include "collide.h"
#include "camera.h"
#include "level.h"
#include "item.h"
#include "items.h"
/*this file has all the related functions to sliding*/

4
TR5Main/Game/Lara/lara_surface.cpp
View file

@ -5,13 +5,9 @@
#include "camera.h"
#include "collide.h"
#include "items.h"
#include "control/box.h"
#include "Lara.h"
#include "lara_swim.h"
#include "lara_fire.h"
#include "level.h"
#include "input.h"
#include "item.h"
bool EnableCrawlFlexWaterPullUp, EnableCrawlFlexSubmerged;

8
TR5Main/Game/Lara/lara_swim.cpp
View file

@ -3,18 +3,12 @@
#include "control/control.h"
#include "camera.h"
#include "items.h"
#include "control/box.h"
#include "Lara.h"
#include "lara_surface.h"
#include "effects\effects.h"
#include "lara_fire.h"
#include "animation.h"
#include "camera.h"
#include "level.h"
#include "input.h"
#include "Sound\sound.h"
#include "Sound/sound.h"
#include "GameFlowScript.h"
#include "item.h"
struct SUBSUIT_INFO
{

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

@ -8,7 +8,7 @@
#include "lara_collide.h"
#include "control/control.h"
#include "control\los.h"
#include "item.h"
#include "items.h"
using namespace TEN::Floordata;

2
TR5Main/Game/Lara/lara_two_guns.cpp
View file

@ -12,7 +12,7 @@
#include "Sound\sound.h"
#include "savegame.h"
#include "Specific\prng.h"
#include "item.h"
#include "items.h"
using namespace TEN::Math::Random;
struct PISTOL_DEF

2
TR5Main/Game/animation.cpp
View file

@ -6,7 +6,7 @@
#include "Renderer11.h"
#include "Sound/sound.h"
#include "flipeffect.h"
#include "item.h"
#include "items.h"
using TEN::Renderer::g_Renderer;

2
TR5Main/Game/camera.cpp
View file

@ -15,7 +15,7 @@
#include "control\los.h"
#include "savegame.h"
#include "input.h"
#include "item.h"
#include "items.h"
using TEN::Renderer::g_Renderer;
using namespace TEN::Effects::Environment;

3
TR5Main/Game/camera.h
View file

@ -1,7 +1,6 @@
#pragma once
#include "Specific\phd_global.h"
#include "Specific/phd_global.h"
#include "items.h"
#include <Specific\setup.h>
enum CAMERA_TYPE
{

12
TR5Main/Game/collide.cpp
View file

@ -1,20 +1,18 @@
#include "framework.h"
#include "control.h"
#include "control\los.h"
#include "control/los.h"
#include "collide.h"
#include "animation.h"
#include "Lara.h"
#include "items.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "sphere.h"
#include "misc.h"
#include "setup.h"
#include "Sound\sound.h"
#include "Specific\trmath.h"
#include "Specific\prng.h"
#include "Sound/sound.h"
#include "Specific/trmath.h"
#include "Specific/prng.h"
#include "room.h"
#include "Renderer11.h"
#include "item.h"
using std::vector;
using namespace TEN::Math::Random;

2
TR5Main/Game/control/box.cpp
View file

@ -12,7 +12,7 @@
#include "Specific/trmath.h"
#include "objectslist.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
#define CHECK_CLICK(x) CLICK(x) / 2
#define ESCAPE_DIST SECTOR(5)

3
TR5Main/Game/control/control.cpp
View file

@ -46,8 +46,7 @@
#include "Lara/lara_one_gun.h"
#include "generic_switch.h"
#include "Scripting/GameFlowScript.h"
#include <Game/effects/lightning.h>
#include "item.h"
#include "Game/effects/lightning.h"
using std::vector;
using std::unordered_map;

2
TR5Main/Game/control/los.cpp
View file

@ -9,7 +9,7 @@
#include "effects/tomb4fx.h"
#include "effects/debris.h"
#include "Lara/lara_one_gun.h"
#include "item.h"
#include "items.h"
int NumberLosRooms;
short LosRooms[20];

2
TR5Main/Game/control/lot.cpp
View file

@ -6,7 +6,7 @@
#include "lara.h"
#include "level.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
#define DEFAULT_FLY_UPDOWN_SPEED 16
#define DEFAULT_SWIM_UPDOWN_SPEED 32

10
TR5Main/Game/control/trigger.cpp
View file

@ -6,17 +6,13 @@
#include "objectslist.h"
#include "control/box.h"
#include "camera.h"
#include "puzzles_keys.h"
#include "pickup.h"
#include "control/lot.h"
#include "spotcam.h"
#include "Sound\sound.h"
#include "traps.h"
#include "Sound/sound.h"
#include "lara.h"
#include "Lara\lara_climb.h"
#include "Objects\Generic\Switches\generic_switch.h"
#include "Lara/lara_climb.h"
#include "Objects/Generic/Switches/generic_switch.h"
#include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire;

2
TR5Main/Game/control/volume.cpp
View file

@ -7,7 +7,7 @@
#include "savegame.h"
#include "RenderEnums.h"
#include "Renderer11.h"
#include "item.h"
#include "items.h"
using TEN::Renderer::g_Renderer;

2
TR5Main/Game/effects/chaffFX.cpp
View file

@ -9,7 +9,7 @@
#include "smoke.h"
#include "spark.h"
#include "Specific\prng.h"
#include "item.h"
#include "items.h"
#define MAX_TRIGGER_RANGE 0x4000
using namespace TEN::Math::Random;

2
TR5Main/Game/effects/chaffFX.h
View file

@ -1,5 +1,5 @@
#pragma once
#include "Specific\phd_global.h"
#include "Specific/phd_global.h"
#include "items.h"
void TriggerChaffEffects(int age);

2
TR5Main/Game/effects/effects.cpp
View file

@ -19,7 +19,7 @@
#include "Specific\prng.h"
#include "Renderer11.h"
#include "Game/effects/lara_burn.h"
#include "item.h"
#include "items.h"
using namespace TEN::Effects::Fire;
using TEN::Renderer::g_Renderer;

1
TR5Main/Game/effects/flmtorch.cpp
View file

@ -10,7 +10,6 @@
#include "input.h"
#include "Sound/sound.h"
#include "Objects/Effects/flame_emitters.h"
#include "item.h"
using namespace TEN::Entities::Effects;

5
TR5Main/Game/effects/footprint.cpp
View file

@ -2,11 +2,10 @@
#include "control/control.h"
#include "lara.h"
#include "animation.h"
#include "effects\groundfx.h"
#include "effects\footprint.h"
#include "effects/groundfx.h"
#include "effects/footprint.h"
#include "level.h"
#include "items.h"
#include "item.h"
namespace TEN {
namespace Effects {

3
TR5Main/Game/effects/footprint.h
View file

@ -1,7 +1,6 @@
#pragma once
#include "Specific\phd_global.h"
#include "items.h"
#include <deque>
#include "Specific/phd_global.h"
namespace TEN{
namespace Effects {

2
TR5Main/Game/effects/hair.cpp
View file

@ -10,7 +10,7 @@
#include "level.h"
#include "effects\weather.h"
#include "Renderer11.h"
#include "item.h"
#include "items.h"
using namespace TEN::Effects::Environment;
using TEN::Renderer::g_Renderer;

1
TR5Main/Game/effects/lara_burn.cpp
View file

@ -5,7 +5,6 @@
#include "Game/effects/lara_burn.h"
#include "Game/items.h"
#include "Game/control/control.h"
#include "item.h"
namespace TEN::Effects::Fire
{

2
TR5Main/Game/effects/smoke.cpp
View file

@ -9,7 +9,7 @@
#include "lara.h"
#include "Specific\prng.h"
#include "effects\weather.h"
#include "item.h"
#include "items.h"
using namespace TEN::Effects::Environment;
using namespace TEN::Math::Random;

2
TR5Main/Game/effects/tomb4fx.cpp
View file

@ -17,7 +17,7 @@
#include "effects/effects.h"
#include "effects/weather.h"
#include "animation.h"
#include "item.h"
#include "items.h"
using std::vector;
using TEN::Renderer::g_Renderer;

2
TR5Main/Game/flipeffect.cpp
View file

@ -24,7 +24,7 @@
#include "effects\footprint.h"
#include "effects\groundfx.h"
#include "effects\debris.h"
#include "item.h"
#include "items.h"
using std::function;
using namespace TEN::Effects::Footprints;

2
TR5Main/Game/floordata.cpp
View file

@ -4,7 +4,7 @@
#include "room.h"
#include "level.h"
#include "setup.h"
#include "item.h"
#include "items.h"
using namespace TEN::Floordata;

2
TR5Main/Game/health.cpp
View file

@ -7,7 +7,7 @@
#include "level.h"
#include "control/control.h"
#include "Renderer11.h"
#include "item.h"
#include "items.h"
using namespace TEN::Renderer;
short PickupX;

56
TR5Main/Game/item.h
View file

@ -1,56 +0,0 @@
#pragma once
#include <cstdint>
#include "phd_global.h"
#include <string>
#include "itemdata.h"
#include "roomvector.h"
enum GAME_OBJECT_ID : short;
struct ITEM_INFO {
int floor;
uint32_t touchBits;
uint32_t meshBits;
GAME_OBJECT_ID objectNumber;
short currentAnimState;
short goalAnimState;
short requiredAnimState;
short animNumber;
short frameNumber;
short roomNumber;
ROOM_VECTOR location;
short nextItem;
short nextActive;
short speed;
short fallspeed;
short hitPoints;
int boxNumber;
short timer;
uint16_t flags; // ItemFlags enum
short shade;
short triggerFlags;
short carriedItem;
short afterDeath;
short firedWeapon;
short itemFlags[8];
ITEM_DATA data;
PHD_3DPOS pos;
bool active;
short status; // ItemStatus enum
bool gravityStatus;
bool hitStatus;
bool collidable;
bool lookedAt;
bool dynamicLight;
bool poisoned;
uint8_t aiBits; // AIObjectType enum
bool reallyActive;
bool inDrawRoom;
bool friendly;
uint32_t swapMeshFlags;
short drawRoom;
short TOSSPAD;
PHD_3DPOS startPos;
short locationAI;
std::string luaName;
};

1
TR5Main/Game/items.cpp
View file

@ -6,7 +6,6 @@
#include "control/control.h"
#include "floordata.h"
#include "effects/effects.h"
#include "item.h"
using namespace TEN::Floordata;

2
TR5Main/Game/misc.cpp
View file

@ -5,7 +5,7 @@
#include "lara.h"
#include "animation.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
using std::vector;
CREATURE_INFO* GetCreatureInfo(ITEM_INFO* item)

6
TR5Main/Game/missile.cpp
View file

@ -1,15 +1,13 @@
#include "framework.h"
#include "missile.h"
#include "Sound\sound.h"
#include "Sound/sound.h"
#include "items.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "animation.h"
#include "effects\debris.h"
#include "level.h"
#include "setup.h"
#include "lara.h"
#include "collide.h"
#include "item.h"
#define SHARD_DAMAGE 30
#define ROCKET_DAMAGE 100

2
TR5Main/Game/newinv2.cpp
View file

@ -18,7 +18,7 @@
#include "input.h"
#include "pickup.h"
#include "Renderer11.h"
#include "item.h"
#include "items.h"
using namespace TEN::Renderer;
bool goUp, goDown, goRight, goLeft, goSelect, goDeselect;

9
TR5Main/Game/objects.cpp
View file

@ -1,21 +1,16 @@
#include "framework.h"
#include "objects.h"
#include "items.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "animation.h"
#include "Lara.h"
#include "sphere.h"
#include "effects\debris.h"
#include "control/control.h"
#include "switch.h"
#include "control/box.h"
#include "setup.h"
#include "effects\tomb4fx.h"
#include "level.h"
#include "input.h"
#include "Sound\sound.h"
#include "Sound/sound.h"
#include "collide.h"
#include "item.h"
OBJECT_TEXTURE* WaterfallTextures[6];
float WaterfallY[6];

7
TR5Main/Game/particle/SimpleParticle.cpp
View file

@ -1,10 +1,9 @@
#include "framework.h"
#include "SimpleParticle.h"
#include "items.h"
#include "Specific\trmath.h"
#include <Specific\setup.h>
#include "Specific\prng.h"
#include "item.h"
#include "Specific/trmath.h"
#include "Specific/setup.h"
#include "Specific/prng.h"
using namespace TEN::Math::Random;

2
TR5Main/Game/people.cpp
View file

@ -8,7 +8,7 @@
#include "lara.h"
#include "Sound\sound.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
int ShotLara(ITEM_INFO* item, AI_INFO* info, BITE_INFO* gun, short extra_rotation, int damage)
{

1
TR5Main/Game/pickup/pickup.cpp
View file

@ -28,7 +28,6 @@
#include "pickup/pickup_weapon.h"
#include "pickup/pickup_consumable.h"
#include "pickup/pickup_misc_items.h"
#include "item.h"
OBJECT_COLLISION_BOUNDS PickUpBounds = // offset 0xA1338
{

2
TR5Main/Game/pickup/pickup_misc_items.cpp
View file

@ -1,7 +1,7 @@
#include "framework.h"
#include <array>
#include "pickup_misc_items.h"
#include "objectslist.h"
#include <array>
#include "lara_struct.h"
#include "pickuputil.h"

2
TR5Main/Game/puzzles_keys.cpp
View file

@ -14,7 +14,7 @@
#include "puzzles_keys.h"
#include "generic_switch.h"
#include "camera.h"
#include "item.h"
#include "items.h"
using namespace TEN::Entities::Switches;

2
TR5Main/Game/room.cpp
View file

@ -4,7 +4,7 @@
#include "control/lot.h"
#include "control/volume.h"
#include "Renderer11.h"
#include "item.h"
#include "items.h"
using namespace TEN::Renderer;

2
TR5Main/Game/rope.cpp
View file

@ -7,7 +7,7 @@
#include "control/control.h"
#include "Sound\sound.h"
#include "camera.h"
#include "item.h"
#include "items.h"
PENDULUM CurrentPendulum;
PENDULUM AlternatePendulum;

1
TR5Main/Game/savegame.cpp
View file

@ -17,7 +17,6 @@
#include "fullblock_switch.h"
#include "itemdata/creature_info.h"
#include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire;
using namespace TEN::Entities::Switches;

2
TR5Main/Game/sphere.cpp
View file

@ -6,7 +6,7 @@
#include "setup.h"
#include "Renderer11.h"
#include "Specific\trmath.h"
#include "item.h"
#include "items.h"
using namespace TEN::Renderer;

2
TR5Main/Game/spotcam.cpp
View file

@ -7,7 +7,7 @@
#include "lara.h"
#include "input.h"
#include "control\volume.h"
#include "item.h"
#include "items.h"
using namespace TEN::Renderer;
using namespace TEN::Control::Volumes;

1
TR5Main/Game/switch.cpp
View file

@ -16,7 +16,6 @@
#include "level.h"
#include "input.h"
#include "Sound\sound.h"
#include "item.h"
// NOTE: we need to decompile/inspect if these functions are still needed

2
TR5Main/Game/traps.cpp
View file

@ -14,8 +14,6 @@
#include "input.h"
#include "room.h"
#include "Sound/sound.h"
#include "item.h"
using namespace TEN::Effects::Environment;

10
TR5Main/Objects/Effects/flame_emitters.cpp
View file

@ -8,12 +8,12 @@
#include "effects/tomb4fx.h"
#include "collide.h"
#include "animation.h"
#include <Game/effects/effects.h>
#include <weather.h>
#include <Specific/setup.h>
#include <Game/effects/lightning.h>
#include "Game/effects/effects.h"
#include "weather.h"
#include "Specific/setup.h"
#include "Game/effects/lightning.h"
#include "Game/effects/lara_burn.h"
#include "item.h"
#include "items.h"
using namespace TEN::Effects::Fire;
using namespace TEN::Effects::Lightning;

9
TR5Main/Objects/Effects/tr4_bubbles.cpp
View file

@ -1,18 +1,15 @@
#include "framework.h"
#include "tr4_bubbles.h"
#include "effects\debris.h"
#include "effects/debris.h"
#include "items.h"
#include "traps.h"
#include "animation.h"
#include "effects\tomb4fx.h"
#include "effects\effects.h"
#include "effects/tomb4fx.h"
#include "effects/effects.h"
#include "level.h"
#include "lara.h"
#include "control/control.h"
#include "tr4_mutant.h"
#include "collide.h"
#include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire;

2
TR5Main/Objects/Effects/tr4_locusts.cpp
View file

@ -8,7 +8,7 @@
#include "effects/tomb4fx.h"
#include "collide.h"
#include "animation.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::TR4
{

2
TR5Main/Objects/Effects/tr5_electricity.cpp
View file

@ -11,7 +11,7 @@
#include "sphere.h"
#include "traps.h"
#include "Game/effects/lara_burn.h"
#include "item.h"
#include "items.h"
using namespace TEN::Effects::Fire;

1
TR5Main/Objects/Generic/Doors/double_doors.cpp
View file

@ -17,7 +17,6 @@
#include "misc.h"
#include "double_doors.h"
#include "collide.h"
#include "item.h"
namespace TEN::Entities::Doors
{

1
TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp
View file

@ -18,7 +18,6 @@
#include "pushpull_kick_door.h"
#include "collide.h"
#include "itemdata/door_data.h"
#include "item.h"
namespace TEN::Entities::Doors
{

1
TR5Main/Objects/Generic/Doors/sequence_door.cpp
View file

@ -18,7 +18,6 @@
#include "sequence_door.h"
#include "fullblock_switch.h"
#include "itemdata/door_data.h"
#include "item.h"
using namespace TEN::Entities::Switches;

1
TR5Main/Objects/Generic/Doors/steel_door.cpp
View file

@ -17,7 +17,6 @@
#include "misc.h"
#include "steel_door.h"
#include "collide.h"
#include "item.h"
namespace TEN::Entities::Doors
{

2
TR5Main/Objects/Generic/Doors/underwater_door.cpp
View file

@ -17,8 +17,6 @@
#include "misc.h"
#include "underwater_door.h"
#include "collide.h"
#include "item.h"
namespace TEN::Entities::Doors
{

2
TR5Main/Objects/Generic/Object/generic_bridge.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "Specific\phd_global.h"
#include "level.h"
#include "item.h"
#include "items.h"
void InitialiseBridge(short itemNumber);
int GetOffset(short angle, int x, int z);

2
TR5Main/Objects/Generic/Object/generic_trapdoor.cpp
View file

@ -6,7 +6,7 @@
#include "control/control.h"
#include "level.h"
#include "animation.h"
#include "item.h"
#include "items.h"
OBJECT_COLLISION_BOUNDS CeilingTrapDoorBounds = {-256, 256, 0, 900, -768, -256, -1820, 1820, -5460, 5460, -1820, 1820};
static PHD_VECTOR CeilingTrapDoorPos = {0, 1056, -480};

2
TR5Main/Objects/Generic/Switches/cog_switch.cpp
View file

@ -9,7 +9,7 @@
#include "generic_doors.h"
#include "collide.h"
#include "animation.h"
#include "item.h"
#include "items.h"
using namespace TEN::Entities::Doors;

2
TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
View file

@ -9,7 +9,7 @@
#include "level.h"
#include "collide.h"
#include "animation.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches
{

2
TR5Main/Objects/Generic/Switches/fullblock_switch.cpp
View file

@ -7,7 +7,7 @@
#include "collide.h"
#include "level.h"
#include "animation.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches
{

2
TR5Main/Objects/Generic/Switches/generic_switch.cpp
View file

@ -6,7 +6,7 @@
#include "generic_switch.h"
#include "animation.h"
#include "collide.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches
{

2
TR5Main/Objects/Generic/Switches/jump_switch.cpp
View file

@ -6,7 +6,7 @@
#include "generic_switch.h"
#include "level.h"
#include "collide.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches
{

2
TR5Main/Objects/Generic/Switches/pulley_switch.cpp
View file

@ -8,7 +8,7 @@
#include "pickup.h"
#include "level.h"
#include "collide.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches
{

2
TR5Main/Objects/Generic/Switches/rail_switch.cpp
View file

@ -6,7 +6,7 @@
#include "level.h"
#include "collide.h"
#include "animation.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches
{

2
TR5Main/Objects/Generic/Switches/turn_switch.cpp
View file

@ -9,7 +9,7 @@
#include "level.h"
#include "collide.h"
#include "animation.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches

2
TR5Main/Objects/Generic/Switches/underwater_switch.cpp
View file

@ -7,7 +7,7 @@
#include "collide.h"
#include "level.h"
#include "animation.h"
#include "item.h"
#include "items.h"
namespace TEN::Entities::Switches

5
TR5Main/Objects/Generic/Traps/dart_emitter.cpp
View file

@ -2,10 +2,9 @@
#include "Objects/Generic/Traps/dart_emitter.h"
#include "level.h"
#include "lara.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "items.h"
#include "Sound\sound.h"
#include "item.h"
#include "Sound/sound.h"
namespace TEN::Entities::Traps
{

2
TR5Main/Objects/TR1/Entity/tr1_ape.cpp
View file

@ -6,7 +6,7 @@
#include "level.h"
#include "lara.h"
#include "control/control.h"
#include "item.h"
#include "items.h"
BITE_INFO apeBite = { 0, -19, 75, 15 };

2
TR5Main/Objects/TR1/Entity/tr1_bear.cpp
View file

@ -8,7 +8,7 @@
#include "lara.h"
#include "itemdata/creature_info.h"
#include "control/control.h"
#include "item.h"
#include "items.h"
BITE_INFO bearBite = { 0, 96, 335, 14 };

2
TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
View file

@ -8,7 +8,7 @@
#include "people.h"
#include "setup.h"
#include "control/control.h"
#include "item.h"
#include "items.h"
#define BIG_RAT_RUN_TURN ANGLE(6.0f)
#define BIG_RAT_SWIM_TURN ANGLE(3.0f)

1
TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
View file

@ -7,7 +7,6 @@
#include "lara.h"
#include "control/control.h"
#include "animation.h"
#include "item.h"
// TODO: Evil lara is not targetable and cant move like lara.

1
TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp
View file

@ -10,7 +10,6 @@
#include "Sound/sound.h"
#include "itemdata/creature_info.h"
#include "animation.h"
#include "item.h"
enum abortion_anims {
ABORT_EMPTY, ABORT_STOP, ABORT_TURNL, ABORT_TURNR, ABORT_ATTACK1, ABORT_ATTACK2,

7
TR5Main/Objects/TR1/Entity/tr1_natla.cpp
View file

@ -5,11 +5,10 @@
#include "items.h"
#include "missile.h"
#include "level.h"
#include "Sound\sound.h"
#include "effects\effects.h"
#include "Specific\trmath.h"
#include "Sound/sound.h"
#include "effects/effects.h"
#include "Specific/trmath.h"
#include "itemdata/creature_info.h"
#include "item.h"
#define NATLA_NEAR_DEATH 200

4
TR5Main/Objects/TR1/Entity/tr1_wolf.cpp
View file

@ -2,14 +2,12 @@
#include "tr1_wolf.h"
#include "items.h"
#include "control/box.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "lara.h"
#include "setup.h"
#include "control/control.h"
#include "level.h"
#include "itemdata/creature_info.h"
#include "control/control.h"
#include "item.h"
BITE_INFO wolfBite = { 0, -14, 174, 6 };

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

@ -6,7 +6,7 @@
#include "setup.h"
#include "level.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
BITE_INFO barracudaBite = { 2, -60, 121, 7 };

2
TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
View file

@ -6,7 +6,7 @@
#include "setup.h"
#include "level.h"
#include "control/control.h"
#include "item.h"
#include "items.h"
BITE_INFO birdyBiteL = { 0, 224, 0, 19 };
BITE_INFO birdyBiteR = { 0, 224, 0, 22 };

1
TR5Main/Objects/TR2/Entity/tr2_dragon.cpp
View file

@ -14,7 +14,6 @@
#include "animation.h"
#include "Sound/sound.h"
#include "itemdata/creature_info.h"
#include "item.h"
#define DRAGON_SWIPE_DAMAGE 250
#define DRAGON_TOUCH_DAMAGE 10

3
TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp
View file

@ -1,13 +1,12 @@
#include "framework.h"
#include "tr2_eagle_or_crow.h"
#include "control/box.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "lara.h"
#include "items.h"
#include "setup.h"
#include "level.h"
#include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO eagleBite = { 15, 46, 21, 6 };
BITE_INFO crowBite = { 2, 10, 60, 14 };

5
TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp
View file

@ -1,17 +1,16 @@
#include "framework.h"
#include "tr2_knifethrower.h"
#include "items.h"
#include "effects\effects.h"
#include "effects/effects.h"
#include "control/box.h"
#include "people.h"
#include "setup.h"
#include "level.h"
#include "lara.h"
#include "Sound\sound.h"
#include "Sound/sound.h"
#include "itemdata/creature_info.h"
#include "floordata.h"
#include "collide.h"
#include "item.h"
BITE_INFO knifeLeft = { 0, 0, 0, 5 };
BITE_INFO knifeRight = { 0, 0, 0, 8 };

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

@ -7,7 +7,7 @@
#include "control/control.h"
#include "Specific\trmath.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
BITE_INFO mercUziBite = { 0, 150, 19, 17 };
BITE_INFO mercAutoPistolBite = { 0, 230, 9, 17 };

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

@ -7,7 +7,7 @@
#include "setup.h"
#include "level.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
BITE_INFO monkBite = { -23,16,265, 14 };

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

@ -8,7 +8,7 @@
#include "level.h"
#include "itemdata/creature_info.h"
#include "control/control.h"
#include "item.h"
#include "items.h"
BITE_INFO ratBite = { 0, 0, 57, 2 };

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

@ -7,7 +7,7 @@
#include "level.h"
#include "control/control.h"
#include "animation.h"
#include "item.h"
#include "items.h"
BITE_INFO sharkBite = { 17, -22, 344, 12 };

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

@ -6,7 +6,7 @@
#include "level.h"
#include "control/control.h"
#include "itemdata/creature_info.h"
#include "item.h"
#include "items.h"
BITE_INFO silencerGun = { 3, 331, 56, 10 };

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

@ -14,8 +14,6 @@
#include "itemdata/creature_info.h"
#include "skidoo_info.h"
#include "animation.h"
#include "item.h"
enum SKIDMAN_STATE { SMAN_EMPTY, SMAN_WAIT, SMAN_MOVING, SMAN_STARTLEFT, SMAN_STARTRIGHT, SMAN_LEFT, SMAN_RIGHT, SMAN_DEATH };

1
TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp
View file

@ -9,7 +9,6 @@
#include "lara.h"
#include "Sound/sound.h"
#include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO spearLeftBite = { 0, 0, 920, 11 };
BITE_INFO spearRightBite = { 0, 0, 920, 18 };

1
TR5Main/Objects/TR2/Entity/tr2_spider.cpp
View file

@ -11,7 +11,6 @@
#include "itemdata/creature_info.h"
#include "control/control.h"
#include "animation.h"
#include "item.h"
BITE_INFO spiderBite = { 0, 0, 41, 1 };

Some files were not shown because too many files have changed in this diff Show more