Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 08:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reorganize includes tier 3

Browse source
This commit is contained in:
Lwmte 2021-12-24 03:32:19 +03:00
parent 52c1faca85
commit 8f4ba68f30
177 changed files with 778 additions and 698 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_basic.h" #include "Game/Lara/lara_basic.h"
#include "Game/Lara/lara_helpers.h" #include "Game/Lara/lara_helpers.h"
#include "Game/Lara/lara_jump.h" #include "Game/Lara/lara_jump.h"
@ -18,31 +18,30 @@
#include "Game/Lara/lara_climb.h" #include "Game/Lara/lara_climb.h"
#include "Game/Lara/lara_initialise.h" #include "Game/Lara/lara_initialise.h"
#include "motorbike.h" #include "Objects/TR2/Vehicles/snowmobile.h"
#include "biggun.h" #include "Objects/TR3/Vehicles/biggun.h"
#include "quad.h" #include "Objects/TR3/Vehicles/kayak.h"
#include "snowmobile.h" #include "Objects/TR3/Vehicles/minecart.h"
#include "jeep.h" #include "Objects/TR3/Vehicles/quad.h"
#include "upv.h" #include "Objects/TR3/Vehicles/upv.h"
#include "kayak.h" #include "Objects/TR4/Vehicles/jeep.h"
#include "minecart.h" #include "Objects/TR4/Vehicles/motorbike.h"
#include "Objects/Generic/Object/rope.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "GameFlowScript.h"
#include "Game/control/flipeffect.h"
#include "Sound/sound.h"
#include "Game/savegame.h"
#include "Objects/Generic/Object/rope.h"
#include "Game/misc.h"
#include "Game/control/volume.h"
#include "Game/collision/collide_item.h"
#include "Renderer/Renderer11.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/items.h" #include "Game/collision/collide_item.h"
#include "Game/gui.h" #include "Game/control/flipeffect.h"
#include "Game/control/volume.h"
#include "Game/effects/lara_fx.h" #include "Game/effects/lara_fx.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/tomb4fx.h"
#include "Game/gui.h"
#include "Game/items.h"
#include "Game/misc.h"
#include "Game/savegame.h"
#include "Scripting/GameFlowScript.h"
#include "Sound/sound.h"
#include "Renderer/Renderer11.h"
using namespace TEN::Effects::Lara; using namespace TEN::Effects::Lara;
using namespace TEN::Entities::Generic; using namespace TEN::Entities::Generic;

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

@ -1,22 +1,23 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_basic.h" #include "Game/Lara/lara_basic.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_room.h"
#include "Game/health.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Game/Lara/lara_collide.h" #include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_slide.h" #include "Game/Lara/lara_slide.h"
#include "Game/Lara/lara_monkey.h" #include "Game/Lara/lara_monkey.h"
#include "Game/Lara/lara_helpers.h" #include "Game/Lara/lara_helpers.h"
#include "Game/pickup/pickup.h"
#include "Sound/sound.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Game/health.h" #include "Scripting/GameFlowScript.h"
#include "Sound/sound.h"
#include "Game/animation.h"
#include "Game/pickup/pickup.h"
#include "Game/collision/collide_room.h"
#include "Game/items.h"
#include "Game/camera.h"
#include "GameFlowScript.h"
// ------------------------------ // ------------------------------
// BASIC MOVEMENT & MISCELLANEOUS // BASIC MOVEMENT & MISCELLANEOUS

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

@ -1,14 +1,15 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_cheat.h" #include "Game/Lara/lara_cheat.h"
#include "Specific/input.h"
#include "GameFlowScript.h"
#include "Game/effects/effects.h"
#include "Sound/sound.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/effects/effects.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/setup.h" #include "Game/Lara/lara.h"
#include "Scripting/GameFlowScript.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h"
int NoCheatCounter; int NoCheatCounter;

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

@ -1,13 +1,14 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_climb.h" #include "Game/Lara/lara_climb.h"
#include "Game/Lara/lara.h"
#include "Game/control/control.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/collision/sphere.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/collision/sphere.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Game/items.h"
short GetClimbFlags(int x, int y, int z, short roomNumber) short GetClimbFlags(int x, int y, int z, short roomNumber)
{ {

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

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Game/items.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/items.h"
enum class CLIMB_DIRECTION : short enum class CLIMB_DIRECTION : short
{ {

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

@ -1,16 +1,17 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara_collide.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/effects/effects.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/Lara/lara_collide.h" #include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_swim.h" #include "Game/Lara/lara_swim.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Game/items.h" #include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Scripting/GameFlowScript.h" #include "Scripting/GameFlowScript.h"
#include "Scripting/GameScriptLevel.h" #include "Scripting/GameScriptLevel.h"

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

@ -1,17 +1,19 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_crawl.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_room.h"
#include "Game/control/control.h"
#include "Game/control/los.h"
#include "Game/items.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Game/Lara/lara_collide.h" #include "Game/Lara/lara_collide.h"
#include "Game/animation.h"
#include "Game/control/los.h"
#include "Game/Lara/lara_flare.h" #include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_helpers.h" #include "Game/Lara/lara_helpers.h"
#include "Game/collision/collide_room.h" #include "Specific/input.h"
#include "Game/items.h" #include "Specific/level.h"
#include "Game/camera.h"
#include "Game/control/control.h"
#include "Scripting/GameFlowScript.h" #include "Scripting/GameFlowScript.h"
// ----------------------------- // -----------------------------

3
TR5Main/Game/Lara/lara_crawl.h
View file

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
struct ITEM_INFO;
struct COLL_INFO;
// ----------------------------- // -----------------------------
// CRAWL & CROUCH // CRAWL & CROUCH
// Control & Collision Functions // Control & Collision Functions

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

@ -1,25 +1,26 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_fire.h" #include "Game/Lara/lara_fire.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/sphere.h"
#include "Game/control/los.h"
#include "Game/control/lot.h"
#include "Game/effects/effects.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara_flare.h" #include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_one_gun.h" #include "Game/Lara/lara_one_gun.h"
#include "Game/Lara/lara_struct.h"
#include "Game/Lara/lara_two_guns.h" #include "Game/Lara/lara_two_guns.h"
#include "Game/camera.h" #include "Game/savegame.h"
#include "Objects/Generic/Object/burning_torch.h"
#include "Objects/Generic/Object/objects.h" #include "Objects/Generic/Object/objects.h"
#include "Game/effects/effects.h" #include "Scripting/GameFlowScript.h"
#include "Game/collision/sphere.h" #include "Sound/sound.h"
#include "Game/animation.h"
#include "Specific/level.h"
#include "Game/control/lot.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Sound/sound.h" #include "Specific/level.h"
#include "Game/control/los.h"
#include "Game/savegame.h"
#include "GameFlowScript.h"
#include "Game/Lara/lara_struct.h"
#include "Game/itemdata/creature_info.h"
#include "Objects/Generic/Object/burning_torch.h"
using namespace TEN::Entities::Generic; using namespace TEN::Entities::Generic;

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

@ -1,16 +1,17 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_flare.h" #include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_tests.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Sound/sound.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/items.h"
#include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/effects/chaffFX.h" #include "Game/effects/chaffFX.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara_tests.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/prng.h" #include "Specific/prng.h"
using namespace TEN::Math::Random; using namespace TEN::Math::Random;

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

@ -1,11 +1,13 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara_hang.h"
#include "Specific/input.h"
#include "Game/Lara/lara_tests.h" #include "Game/camera.h"
#include "Game/items.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Game/camera.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_tests.h"
#include "Specific/input.h"
#include "Specific/level.h" #include "Specific/level.h"
/*this file has all the lara_as/lara_col functions related to hanging*/ /*this file has all the lara_as/lara_col functions related to hanging*/

3
TR5Main/Game/Lara/lara_hang.h
View file

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
struct ITEM_INFO;
struct COLL_INFO;
// Hanging and shimmying // Hanging and shimmying
void lara_as_hang(ITEM_INFO* item, COLL_INFO* coll); void lara_as_hang(ITEM_INFO* item, COLL_INFO* coll);
void lara_col_hang(ITEM_INFO* item, COLL_INFO* coll); void lara_col_hang(ITEM_INFO* item, COLL_INFO* coll);

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

@ -1,15 +1,16 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_helpers.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Specific/input.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_helpers.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Game/Lara/lara_collide.h" #include "Game/Lara/lara_collide.h"
#include "Specific/setup.h"
#include "Scripting/GameFlowScript.h" #include "Scripting/GameFlowScript.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
// ----------------------------- // -----------------------------
// HELPER FUNCTIONS // HELPER FUNCTIONS

1
TR5Main/Game/Lara/lara_info.h
View file

@ -1 +0,0 @@
#pragma once

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

@ -1,11 +1,12 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_initialise.h" #include "Game/Lara/lara_initialise.h"
#include "Game/Lara/lara_tests.h"
#include "Game/health.h" #include "Game/health.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/setup.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_tests.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h"
void InitialiseLara(int restore) void InitialiseLara(int restore)
{ {

13
TR5Main/Game/Lara/lara_jump.cpp
View file

@ -1,18 +1,19 @@
#include "framework.h" #include "framework.h"
#include "Game/control/control.h" #include "Game/Lara/lara_jump.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Sound/sound.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_collide.h" #include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Game/Lara/lara_helpers.h" #include "Game/Lara/lara_helpers.h"
#include "Game/Lara/lara_jump.h"
#include "Game/Lara/lara_basic.h" #include "Game/Lara/lara_basic.h"
#include "Game/Lara/lara_slide.h" #include "Game/Lara/lara_slide.h"
#include "Scripting/GameFlowScript.h" #include "Scripting/GameFlowScript.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
// ----------------------------- // -----------------------------
// JUMP // JUMP

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

@ -1,15 +1,16 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h"
#include "Specific/input.h"
#include "Game/control/control.h"
#include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_tests.h"
#include "Game/Lara/lara_monkey.h" #include "Game/Lara/lara_monkey.h"
#include "Game/camera.h"
#include "Game/collision/floordata.h" #include "Game/collision/floordata.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Game/control/control.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/camera.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_tests.h"
#include "Specific/input.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Scripting/GameFlowScript.h" #include "Scripting/GameFlowScript.h"

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

@ -1,17 +1,17 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara_objects.h"
#include "Game/Lara/lara_tests.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Sound/sound.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "rope.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/items.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Objects/Generic/Object/rope.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Objects/Generic/Object/rope.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h"
using namespace TEN::Entities::Generic; using namespace TEN::Entities::Generic;

4
TR5Main/Game/Lara/lara_objects.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "Game/Lara/lara_struct.h"
struct ITEM_INFO;
struct COLL_INFO;
// ----------------------------------- // -----------------------------------
// MISCELLANEOUS INTERACTABLE OBJECT // MISCELLANEOUS INTERACTABLE OBJECT

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

@ -1,27 +1,28 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_one_gun.h" #include "Game/Lara/lara_one_gun.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_item.h"
#include "Game/control/box.h"
#include "Game/effects/bubble.h"
#include "Game/control/control.h"
#include "Game/effects/debris.h"
#include "Game/effects/effects.h"
#include "Game/effects/lara_fx.h"
#include "Game/effects/tomb4fx.h"
#include "Game/effects/weather.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h" #include "Game/Lara/lara_fire.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/collision/collide_item.h"
#include "Game/effects/debris.h"
#include "Game/effects/weather.h"
#include "Game/Lara/lara_two_guns.h" #include "Game/Lara/lara_two_guns.h"
#include "Game/savegame.h"
#include "Objects/Generic/Object/objects.h" #include "Objects/Generic/Object/objects.h"
#include "Game/camera.h" #include "Objects/Generic/Switches/generic_switch.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Game/savegame.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Game/effects/bubble.h"
#include "generic_switch.h"
#include "Game/effects/lara_fx.h"
using namespace TEN::Effects::Lara; using namespace TEN::Effects::Lara;
using namespace TEN::Entities::Switches; using namespace TEN::Entities::Switches;

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

@ -1,13 +1,15 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_slide.h"
#include "Game/camera.h"
#include "Game/collision/collide_room.h"
#include "Game/items.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_collide.h" #include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Specific/input.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Game/collision/collide_room.h" #include "Specific/input.h"
#include "Game/camera.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Game/items.h"
/*this file has all the related functions to sliding*/ /*this file has all the related functions to sliding*/

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

@ -1,15 +1,16 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_surface.h" #include "Game/Lara/lara_surface.h"
#include "Game/Lara/lara_tests.h"
#include "Game/control/control.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/control/control.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Game/Lara/lara_collide.h" #include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_swim.h" #include "Game/Lara/lara_swim.h"
#include "Game/Lara/lara_tests.h"
#include "Specific/level.h"
#include "Specific/input.h"
void lara_col_surftread(ITEM_INFO* item, COLL_INFO* coll) void lara_col_surftread(ITEM_INFO* item, COLL_INFO* coll)
{ {

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

@ -1,16 +1,17 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_helpers.h"
#include "Game/Lara/lara_swim.h" #include "Game/Lara/lara_swim.h"
#include "Game/control/control.h"
#include "Game/camera.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/camera.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_helpers.h"
#include "Game/Lara/lara.h"
#include "Scripting/GameFlowScript.h"
#include "Sound/sound.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Sound/sound.h"
#include "Scripting/GameFlowScript.h"
#include "Game/Lara/lara_collide.h"
struct SUBSUIT_INFO struct SUBSUIT_INFO
{ {

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

@ -1,21 +1,22 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara_climb.h" #include "Game/collision/collide_room.h"
#include "Game/Lara/lara_helpers.h" #include "Game/collision/collide_item.h"
#include "Game/Lara/lara_monkey.h"
#include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_flare.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/control/los.h" #include "Game/control/los.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_climb.h"
#include "Game/Lara/lara_collide.h"
#include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_helpers.h"
#include "Game/Lara/lara_monkey.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"
#include "Scripting/GameFlowScript.h" #include "Scripting/GameFlowScript.h"
#include "Game/collision/collide_room.h" #include "Specific/input.h"
#include "Game/collision/collide_item.h" #include "Specific/level.h"
using namespace TEN::Renderer; using namespace TEN::Renderer;
using namespace TEN::Floordata; using namespace TEN::Floordata;

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

@ -1,18 +1,19 @@
#include "framework.h" #include "framework.h"
#include "Game/Lara/lara_two_guns.h" #include "Game/Lara/lara_two_guns.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara_fire.h" #include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/effects/effects.h" #include "Game/savegame.h"
#include "Game/animation.h" #include "Sound/sound.h"
#include "Game/effects/tomb4fx.h" #include "Specific/prng.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Game/camera.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Sound/sound.h"
#include "Game/savegame.h"
#include "Specific/prng.h"
#include "Game/items.h"
using namespace TEN::Math::Random; using namespace TEN::Math::Random;
struct PISTOL_DEF struct PISTOL_DEF

13
TR5Main/Game/animation.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h" #include "framework.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Specific/level.h" #include "Game/control/flipeffect.h"
#include "Specific/setup.h" #include "Game/collision/collide_room.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Game/control/flipeffect.h" #include "Specific/level.h"
#include "Game/items.h" #include "Specific/setup.h"
#include "Game/collision/collide_room.h"
using TEN::Renderer::g_Renderer; using TEN::Renderer::g_Renderer;

21
TR5Main/Game/camera.cpp
View file

@ -1,21 +1,22 @@
#include "framework.h" #include "framework.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara.h" #include "Game/collision/collide_room.h"
#include "Game/control/los.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/effects/debris.h" #include "Game/effects/debris.h"
#include "Game/Lara/lara_fire.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h"
#include "Game/room.h"
#include "Game/savegame.h"
#include "Objects/Generic/Object/burning_torch.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Game/collision/collide_room.h"
#include "Game/room.h"
#include "Sound/sound.h"
#include "Game/control/los.h"
#include "Game/savegame.h"
#include "Specific/input.h"
#include "Game/items.h"
#include "Objects/Generic/Object/burning_torch.h"
using TEN::Renderer::g_Renderer; using TEN::Renderer::g_Renderer;
using namespace TEN::Entities::Generic; using namespace TEN::Entities::Generic;

2
TR5Main/Game/camera.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Specific/phd_global.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/phd_global.h"
enum class CAMERA_TYPE enum class CAMERA_TYPE
{ {

6
TR5Main/Game/collision/collide_item.cpp
View file

@ -1,18 +1,18 @@
#include "framework.h" #include "framework.h"
#include "Game/control/los.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Game/control/los.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/collision/sphere.h" #include "Game/collision/sphere.h"
#include "Game/misc.h" #include "Game/room.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Game/room.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"
using namespace TEN::Math::Random; using namespace TEN::Math::Random;

5
TR5Main/Game/collision/collide_room.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h" #include "framework.h"
#include "Game/collision/collide_room.h"
#include "Game/control/los.h" #include "Game/control/los.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Game/collision/collide_room.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/room.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "Game/room.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"
using std::vector; using std::vector;

5
TR5Main/Game/collision/floordata.cpp
View file

@ -1,10 +1,11 @@
#include "framework.h" #include "framework.h"
#include "Game/collision/floordata.h" #include "Game/collision/floordata.h"
#include "Specific/trmath.h"
#include "Game/items.h"
#include "Game/room.h" #include "Game/room.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Game/items.h" #include "Specific/trmath.h"
using namespace TEN::Floordata; using namespace TEN::Floordata;

7
TR5Main/Game/collision/sphere.cpp
View file

@ -1,12 +1,13 @@
#include "framework.h" #include "framework.h"
#include "Game/collision/sphere.h" #include "Game/collision/sphere.h"
#include "Game/animation.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/animation.h"
#include "Game/items.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Renderer/Renderer11.h"
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "Game/items.h" #include "Renderer/Renderer11.h"
using namespace TEN::Renderer; using namespace TEN::Renderer;

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

@ -1,18 +1,19 @@
#include "framework.h" #include "framework.h"
#include "Game/control/box.h" #include "Game/control/box.h"
#include "Game/effects/tomb4fx.h"
#include "Game/control/lot.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/collision/sphere.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/collision/sphere.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/control/lot.h"
#include "Game/effects/tomb4fx.h"
#include "Game/Lara/lara.h"
#include "Game/items.h"
#include "Game/room.h" #include "Game/room.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "Objects/objectslist.h" #include "Objects/objectslist.h"
#include "Game/itemdata/creature_info.h" #include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Objects/TR5/Object/tr5_pushableblock.h" #include "Objects/TR5/Object/tr5_pushableblock.h"
#define CHECK_CLICK(x) CLICK(x) / 2 #define CHECK_CLICK(x) CLICK(x) / 2

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

@ -1,8 +1,8 @@
#include "framework.h" #include "framework.h"
#include <process.h>
#include "winmain.h"
#include "Game/collision/collide_room.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include <process.h>
#include "Game/collision/collide_room.h"
#include "Game/pickup/pickup.h" #include "Game/pickup/pickup.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
@ -12,14 +12,6 @@
#include "Game/control/lot.h" #include "Game/control/lot.h"
#include "Game/health.h" #include "Game/health.h"
#include "Game/savegame.h" #include "Game/savegame.h"
#include "Sound/sound.h"
#include "Game/spotcam.h"
#include "Game/control/box.h"
#include "Objects/Generic/Object/objects.h"
#include "Game/collision/sphere.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Specific/setup.h"
#include "Game/room.h" #include "Game/room.h"
#include "Game/effects/hair.h" #include "Game/effects/hair.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
@ -32,18 +24,27 @@
#include "Game/effects/drip.h" #include "Game/effects/drip.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Game/effects/lightning.h" #include "Game/effects/lightning.h"
#include "Objects/TR5/Emitter/tr5_rats_emitter.h" #include "Game/spotcam.h"
#include "Objects/TR5/Emitter/tr5_bats_emitter.h" #include "Game/control/box.h"
#include "Objects/TR5/Emitter/tr5_spider_emitter.h"
#include "tr4_locusts.h"
#include "tr4_littlebeetle.h"
#include "Game/particle/SimpleParticle.h" #include "Game/particle/SimpleParticle.h"
#include "Specific/prng.h" #include "Game/collision/sphere.h"
#include "Specific/clock.h"
#include "Game/Lara/lara_one_gun.h" #include "Game/Lara/lara_one_gun.h"
#include "Game/Lara/lara_cheat.h" #include "Game/Lara/lara_cheat.h"
#include "Game/Lara/lara_helpers.h" #include "Game/Lara/lara_helpers.h"
#include "generic_switch.h" #include "Objects/Effects/tr4_locusts.h"
#include "Objects/Generic/Object/objects.h"
#include "Objects/Generic/Switches/generic_switch.h"
#include "Objects/TR4/Entity/tr4_littlebeetle.h"
#include "Objects/TR5/Emitter/tr5_rats_emitter.h"
#include "Objects/TR5/Emitter/tr5_bats_emitter.h"
#include "Objects/TR5/Emitter/tr5_spider_emitter.h"
#include "Sound/sound.h"
#include "Specific/clock.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/prng.h"
#include "Specific/winmain.h"
#include "Scripting/GameFlowScript.h" #include "Scripting/GameFlowScript.h"
using std::vector; using std::vector;

5
TR5Main/Game/control/control.h
View file

@ -1,10 +1,9 @@
#pragma once #pragma once
#include "Specific/phd_global.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/control/trigger.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/room.h" #include "Game/room.h"
#include "Game/control/trigger.h" #include "Specific/phd_global.h"
struct BOUNDING_BOX; struct BOUNDING_BOX;
struct ITEM_INFO; struct ITEM_INFO;

23
TR5Main/Game/control/flipeffect.cpp
View file

@ -1,23 +1,24 @@
#include "framework.h" #include "framework.h"
#include "Game/control/flipeffect.h" #include "Game/control/flipeffect.h"
#include "Game/Lara/lara.h"
#include "Game/control/lot.h"
#include "Game/effects/hair.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Sound/sound.h" #include "Game/control/lot.h"
#include "Objects/TR5/Emitter/tr5_spider_emitter.h" #include "Game/effects/hair.h"
#include "tr5_pushableblock.h"
#include "Game/pickup/pickup.h"
#include "Objects/Generic/puzzles_keys.h"
#include "Game/Lara/lara_fire.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/tomb4fx.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Game/effects/footprint.h" #include "Game/effects/footprint.h"
#include "Game/effects/debris.h" #include "Game/effects/debris.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h"
#include "Game/pickup/pickup.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Objects/Generic/puzzles_keys.h"
#include "Objects/TR5/Emitter/tr5_spider_emitter.h"
#include "Objects/TR5/Object/tr5_pushableblock.h"
using std::function; using std::function;
using namespace TEN::Effects::Footprints; using namespace TEN::Effects::Footprints;

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

@ -1,15 +1,16 @@
#include "framework.h" #include "framework.h"
#include "Game/control/los.h" #include "Game/control/los.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Sound/sound.h"
#include "Objects/Generic/Object/objects.h"
#include "switch.h"
#include "Game/Lara/lara_fire.h"
#include "Specific/input.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/tomb4fx.h"
#include "Game/effects/debris.h" #include "Game/effects/debris.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara_one_gun.h"
#include "Objects/Generic/Object/objects.h"
#include "Objects/Generic/Switches/switch.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/setup.h" #include "Specific/setup.h"
int NumberLosRooms; int NumberLosRooms;

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

@ -1,12 +1,13 @@
#include "framework.h" #include "framework.h"
#include "Game/control/lot.h" #include "Game/control/lot.h"
#include "Game/control/box.h" #include "Game/control/box.h"
#include "Specific/setup.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h" #include "Game/itemdata/creature_info.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#define DEFAULT_FLY_UPDOWN_SPEED 16 #define DEFAULT_FLY_UPDOWN_SPEED 16
#define DEFAULT_SWIM_UPDOWN_SPEED 32 #define DEFAULT_SWIM_UPDOWN_SPEED 32

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

@ -1,19 +1,21 @@
#include "framework.h" #include "framework.h"
#include "Game/items.h" #include "Game/control/trigger.h"
#include "Game/room.h"
#include "Specific/setup.h" #include "Game/camera.h"
#include "Game/collision/floordata.h" #include "Game/collision/floordata.h"
#include "Game/control/flipeffect.h" #include "Game/control/flipeffect.h"
#include "Objects/objectslist.h"
#include "Game/control/box.h" #include "Game/control/box.h"
#include "Game/camera.h"
#include "Game/control/lot.h" #include "Game/control/lot.h"
#include "Game/spotcam.h" #include "Game/effects/lara_fx.h"
#include "Sound/sound.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_climb.h" #include "Game/Lara/lara_climb.h"
#include "Game/items.h"
#include "Game/room.h"
#include "Game/spotcam.h"
#include "Objects/Generic/Switches/generic_switch.h" #include "Objects/Generic/Switches/generic_switch.h"
#include "Game/effects/lara_fx.h" #include "Objects/objectslist.h"
#include "Sound/sound.h"
#include "Specific/setup.h"
using namespace TEN::Effects::Lara; using namespace TEN::Effects::Lara;

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

@ -1,13 +1,14 @@
#include "framework.h" #include "framework.h"
#include "Game/control/volume.h" #include "Game/control/volume.h"
#include "Game/room.h"
#include "Specific/setup.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/savegame.h"
#include "RenderEnums.h"
#include "Renderer/Renderer11.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/room.h"
#include "Game/savegame.h"
#include "Specific/setup.h"
#include "Renderer/RenderEnums.h"
#include "Renderer/Renderer11.h"
using TEN::Renderer::g_Renderer; using TEN::Renderer::g_Renderer;

1
TR5Main/Game/control/volume.h
View file

@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Game/room.h" #include "Game/room.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"

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

@ -1,4 +1,6 @@
#include "framework.h" #include "framework.h"
#include "Game/debug/debug.h"
#include <spdlog.h> #include <spdlog.h>
#include <spdlog/sinks/stdout_color_sinks.h> #include <spdlog/sinks/stdout_color_sinks.h>
#include <spdlog/sinks/basic_file_sink.h> #include <spdlog/sinks/basic_file_sink.h>

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

@ -1,11 +1,12 @@
#include "framework.h" #include "framework.h"
#include "Game/effects/bubble.h" #include "Game/effects/bubble.h"
#include "Specific/level.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Specific/trmath.h"
#include "Objects/objectslist.h" #include "Objects/objectslist.h"
#include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Specific/trmath.h"
using std::vector; using std::vector;
using namespace TEN::Math::Random; using namespace TEN::Math::Random;

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

@ -1,15 +1,16 @@
#include "framework.h" #include "framework.h"
#include "Game/effects/chaffFX.h" #include "Game/effects/chaffFX.h"
#include "Game/effects/bubble.h"
#include "Game/effects/tomb4fx.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Specific/level.h" #include "Game/control/control.h"
#include "Game/effects/bubble.h"
#include "Game/effects/smoke.h" #include "Game/effects/smoke.h"
#include "Game/effects/spark.h" #include "Game/effects/spark.h"
#include "Specific/prng.h" #include "Game/effects/tomb4fx.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/prng.h"
#define MAX_TRIGGER_RANGE 0x4000 #define MAX_TRIGGER_RANGE 0x4000
using namespace TEN::Math::Random; using namespace TEN::Math::Random;

7
TR5Main/Game/effects/debris.cpp
View file

@ -1,10 +1,11 @@
#include "framework.h" #include "framework.h"
#include "Game/effects/debris.h" #include "Game/effects/debris.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Specific/trmath.h" #include "Specific/level.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Specific/setup.h"
#include "Specific/trmath.h"
using std::vector; using std::vector;
using namespace TEN::Renderer; using namespace TEN::Renderer;

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

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "Game/collision/sphere.h" #include "Game/collision/sphere.h"
#include "Renderer/Renderer11.h"
#include "Specific/newtypes.h" #include "Specific/newtypes.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Renderer/Renderer11.h"
#include "Renderer/RendererVertex.h" #include "Renderer/RendererVertex.h"
#define MAX_DEBRIS 256 #define MAX_DEBRIS 256

13
TR5Main/Game/effects/drip.cpp
View file

@ -1,15 +1,16 @@
#include "framework.h" #include "framework.h"
#include "drip.h" #include "Game/effects/drip.h"
#include <d3d11.h> #include <d3d11.h>
#include <SimpleMath.h> #include <SimpleMath.h>
#include "Game/control/control.h"
#include "Specific/level.h"
#include "Game/room.h"
#include "Specific/trmath.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Specific/setup.h" #include "Game/control/control.h"
#include "Game/room.h"
#include "Specific/level.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Specific/setup.h"
#include "Specific/trmath.h"
using namespace TEN::Effects::Environment; using namespace TEN::Effects::Environment;
using namespace TEN::Math::Random; using namespace TEN::Math::Random;

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

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <array>
#include <d3d11.h> #include <d3d11.h>
#include <SimpleMath.h> #include <SimpleMath.h>
#include <array>
namespace TEN { namespace TEN {
namespace Effects { namespace Effects {

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

@ -1,24 +1,25 @@
#include "framework.h" #include "framework.h"
#include "Game/animation.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Game/effects/tomb4fx.h" #include "Game/animation.h"
#include "Specific/trmath.h" #include "Game/effects/lara_fx.h"
#include "Sound/sound.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Objects/objectslist.h"
#include "GameFlowScript.h"
#include "Game/effects/spark.h"
#include "Game/effects/explosion.h"
#include "Game/effects/drip.h" #include "Game/effects/drip.h"
#include "Game/effects/bubble.h" #include "Game/effects/bubble.h"
#include "Game/effects/weather.h" #include "Game/effects/explosion.h"
#include "Game/effects/smoke.h" #include "Game/effects/smoke.h"
#include "Specific/prng.h" #include "Game/effects/spark.h"
#include "Renderer/Renderer11.h" #include "Game/effects/tomb4fx.h"
#include "Game/effects/lara_fx.h" #include "Game/effects/weather.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Objects/objectslist.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/prng.h"
#include "Specific/trmath.h"
#include "Scripting/GameFlowScript.h"
#include "Renderer/Renderer11.h"
using TEN::Renderer::g_Renderer; using TEN::Renderer::g_Renderer;
using namespace TEN::Effects::Explosion; using namespace TEN::Effects::Explosion;

7
TR5Main/Game/effects/explosion.cpp
View file

@ -1,11 +1,12 @@
#include "framework.h" #include "framework.h"
#include "Game/effects/explosion.h" #include "Game/effects/explosion.h"
#include "Specific/trmath.h"
#include "Game/effects/effects.h"
#include "Game/effects/spark.h" #include "Game/effects/spark.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/tomb4fx.h"
#include "Specific/setup.h"
#include "Game/effects/effects.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Specific/setup.h"
#include "Specific/trmath.h"
using namespace TEN::Math::Random; using namespace TEN::Math::Random;
namespace TEN { namespace TEN {

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

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <array>
#include <d3d11.h> #include <d3d11.h>
#include <SimpleMath.h> #include <SimpleMath.h>
#include <array>
namespace TEN { namespace TEN {
namespace Effects { namespace Effects {

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

@ -1,12 +1,13 @@
#include "framework.h" #include "framework.h"
#include "Game/control/control.h" #include "Game/effects/footprint.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Sound/sound.h" #include "Game/control/control.h"
#include "Game/effects/footprint.h"
#include "Specific/level.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Specific/level.h"
namespace TEN { namespace TEN {
namespace Effects { namespace Effects {

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

@ -2,6 +2,8 @@
#include <deque> #include <deque>
#include "Specific/phd_global.h" #include "Specific/phd_global.h"
struct ITEM_INFO;
namespace TEN{ namespace TEN{
namespace Effects { namespace Effects {
namespace Footprints { namespace Footprints {

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

@ -1,15 +1,16 @@
#include "framework.h" #include "framework.h"
#include "Game/effects/hair.h" #include "Game/effects/hair.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara.h"
#include "Game/control/control.h"
#include "GameFlowScript.h"
#include "Specific/setup.h"
#include "Game/collision/sphere.h" #include "Game/collision/sphere.h"
#include "Specific/level.h" #include "Game/control/control.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Renderer/Renderer11.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Renderer/Renderer11.h"
#include "Scripting/GameFlowScript.h"
#include "Specific/setup.h"
#include "Specific/level.h"
using namespace TEN::Effects::Environment; using namespace TEN::Effects::Environment;
using TEN::Renderer::g_Renderer; using TEN::Renderer::g_Renderer;

11
TR5Main/Game/effects/lara_fx.cpp
View file

@ -1,12 +1,13 @@
#include "framework.h" #include "framework.h"
#include "Specific/level.h" #include "Game/effects/lara_fx.h"
#include "Game/Lara/lara.h"
#include "Game/collision/floordata.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/effects/smoke.h" #include "Game/effects/smoke.h"
#include "Game/effects/lara_fx.h"
#include "Game/collision/floordata.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/control/control.h" #include "Game/Lara/lara.h"
#include "Specific/level.h"
using namespace TEN::Effects::Smoke; using namespace TEN::Effects::Smoke;

21
TR5Main/Game/effects/lightning.cpp
View file

@ -1,20 +1,19 @@
#include "framework.h" #include "framework.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/lightning.h"
#include "Game/Lara/lara.h"
#include "Game/effects/effects.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Sound/sound.h"
#include "Game/effects/bubble.h" #include "Game/effects/bubble.h"
#include "Specific/trmath.h"
#include "GameFlowScript.h"
#include "Game/effects/smoke.h"
#include "Game/effects/drip.h" #include "Game/effects/drip.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/effects/smoke.h"
#include "Game/effects/tomb4fx.h"
#include "Game/Lara/lara.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"
#include "Game/animation.h" #include "Sound/sound.h"
#include "Game/effects/lightning.h" #include "Scripting/GameFlowScript.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Specific/trmath.h"
using std::vector; using std::vector;
using TEN::Renderer::g_Renderer; using TEN::Renderer::g_Renderer;

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

@ -1,6 +1,8 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>
#include "Specific/phd_global.h"
#include "Specific/trmath.h"
using std::vector; using std::vector;

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

@ -1,15 +1,16 @@
#include <algorithm>
#include "framework.h" #include "framework.h"
#include "Specific/trmath.h"
#include "Game/effects/smoke.h" #include "Game/effects/smoke.h"
#include "Game/room.h"
#include <algorithm>
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/Lara/lara.h"
#include "Specific/prng.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/room.h"
#include "Specific/level.h"
#include "Specific/prng.h"
#include "Specific/setup.h"
#include "Specific/trmath.h"
using namespace TEN::Effects::Environment; using namespace TEN::Effects::Environment;
using namespace TEN::Math::Random; using namespace TEN::Math::Random;

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

@ -1,9 +1,10 @@
#pragma once #pragma once
#include <array>
#include "framework.h" #include "framework.h"
#include "Game/effects/spark.h"
#include <array>
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Game/effects/spark.h"
using namespace DirectX::SimpleMath; using namespace DirectX::SimpleMath;
using namespace TEN::Math::Random; using namespace TEN::Math::Random;

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

@ -1,22 +1,22 @@
#include "framework.h" #include "framework.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/tomb4fx.h"
#include "Game/Lara/lara.h"
#include "Game/effects/effects.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Specific/setup.h" #include "Game/collision/floordata.h"
#include "Specific/level.h"
#include "Sound/sound.h"
#include "Game/effects/bubble.h"
#include "Specific/trmath.h"
#include "GameFlowScript.h"
#include "Game/effects/smoke.h"
#include "Game/effects/drip.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Renderer/Renderer11.h" #include "Game/effects/bubble.h"
#include "Game/effects/drip.h"
#include "Game/effects/smoke.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/collision/floordata.h" #include "Game/Lara/lara.h"
#include "Renderer/Renderer11.h"
#include "Scripting/GameFlowScript.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Specific/trmath.h"
using std::vector; using std::vector;
using TEN::Renderer::g_Renderer; using TEN::Renderer::g_Renderer;

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

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Specific/phd_global.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
#include "Specific/phd_global.h"
struct ITEM_INFO; struct ITEM_INFO;

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

@ -1,10 +1,11 @@
#include "framework.h" #include "framework.h"
#include "Game/camera.h"
#include "Game/savegame.h"
#include "Game/effects/weather.h" #include "Game/effects/weather.h"
#include "Game/camera.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/tomb4fx.h"
#include "Game/savegame.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Specific/prng.h" #include "Specific/prng.h"
#include "Specific/setup.h" #include "Specific/setup.h"

1
TR5Main/Game/effects/weather.h
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <SimpleMath.h> #include <SimpleMath.h>
#include "Scripting/GameScriptLevel.h" #include "Scripting/GameScriptLevel.h"
#include "Specific/trmath.h"
namespace TEN { namespace TEN {
namespace Effects { namespace Effects {

21
TR5Main/Game/gui.cpp
View file

@ -1,22 +1,23 @@
#include "framework.h" #include "framework.h"
#include "Game/gui.h" #include "Game/gui.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/control/control.h"
#include "Game/Lara/lara_fire.h"
#include "Sound/sound.h"
#include "Game/savegame.h"
#include "Game/Lara/lara.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/spotcam.h" #include "Game/control/control.h"
#include "Specific/input.h" #include "Game/items.h"
#include "Specific/configuration.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara_one_gun.h" #include "Game/Lara/lara_one_gun.h"
#include "Game/Lara/lara_two_guns.h" #include "Game/Lara/lara_two_guns.h"
#include "Game/pickup/pickup.h"
#include "Game/savegame.h"
#include "Game/spotcam.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/configuration.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Game/pickup/pickup.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"
#include "Game/items.h"
using namespace TEN::Renderer; using namespace TEN::Renderer;
GuiController g_Gui; GuiController g_Gui;

2
TR5Main/Game/gui.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Specific/configuration.h"
#include "Scripting/LanguageScript.h" #include "Scripting/LanguageScript.h"
#include "Specific/configuration.h"
enum class InventoryMode enum class InventoryMode
{ {

11
TR5Main/Game/health.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h" #include "framework.h"
#include "Game/health.h" #include "Game/health.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/pickup/pickup.h" #include "Game/camera.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Game/Lara/lara_tests.h" #include "Game/Lara/lara_tests.h"
#include "Game/camera.h" #include "Game/pickup/pickup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Renderer/Renderer11.h" #include "Renderer/Renderer11.h"
#include "Game/items.h" #include "Specific/level.h"
using namespace TEN::Renderer; using namespace TEN::Renderer;
short PickupX; short PickupX;

21
TR5Main/Game/itemdata/creature_info.h
View file

@ -2,14 +2,18 @@
#include <vector> #include <vector>
#include "Specific/phd_global.h" #include "Specific/phd_global.h"
struct BOX_NODE { struct ITEM_INFO;
struct BOX_NODE
{
int exitBox; int exitBox;
int searchNumber; int searchNumber;
int nextExpansion; int nextExpansion;
int boxNumber; int boxNumber;
}; };
enum ZoneType : char { enum ZoneType : char
{
ZONE_NULL = -1, // default zone ZONE_NULL = -1, // default zone
ZONE_SKELLY = 0, ZONE_SKELLY = 0,
ZONE_BASIC, ZONE_BASIC,
@ -28,7 +32,8 @@ enum ZoneType : char {
ZONE_HUMAN_LONGJUMP_AND_MONKEY, ZONE_HUMAN_LONGJUMP_AND_MONKEY,
}; };
struct LOT_INFO { struct LOT_INFO
{
std::vector<BOX_NODE> node; std::vector<BOX_NODE> node;
int head; int head;
int tail; int tail;
@ -49,21 +54,25 @@ struct LOT_INFO {
ZoneType zone; ZoneType zone;
bool initialised; bool initialised;
}; };
enum MOOD_TYPE {
enum MOOD_TYPE
{
BORED_MOOD, BORED_MOOD,
ATTACK_MOOD, ATTACK_MOOD,
ESCAPE_MOOD, ESCAPE_MOOD,
STALK_MOOD STALK_MOOD
}; };
enum class CREATURE_AI_PRIORITY { enum class CREATURE_AI_PRIORITY
{
HIGH, HIGH,
MEDIUM, MEDIUM,
LOW, LOW,
NONE NONE
}; };
struct CREATURE_INFO { struct CREATURE_INFO
{
short jointRotation[4]; short jointRotation[4];
short maximumTurn; short maximumTurn;
short flags; short flags;

32
TR5Main/Game/itemdata/itemdata.h
View file

@ -3,23 +3,23 @@
#include <functional> #include <functional>
#include <cstddef> #include <cstddef>
#include <stdexcept> #include <stdexcept>
#include "upv_info.h"
#include "skidoo_info.h"
#include "Game/itemdata/door_data.h"
#include "kayak_info.h"
#include "Game/Lara/lara_struct.h"
#include "jeep_info.h"
#include "motorbike_info.h"
#include "minecart_info.h"
#include "biggun_info.h"
#include "quad_info.h"
#include "tr5_laserhead_info.h"
#include "Game/itemdata/creature_info.h" #include "Game/itemdata/creature_info.h"
#include "boat_info.h" #include "Game/itemdata/door_data.h"
#include "rubberboat_info.h" #include "Game/Lara/lara_struct.h"
#include "phd_global.h" #include "Objects/TR2/Vehicles/boat_info.h"
#include "tr4_wraith_info.h" #include "Objects/TR2/Vehicles/skidoo_info.h"
#include "tr5_pushableblock_info.h" #include "Objects/TR3/Vehicles/minecart_info.h"
#include "Objects/TR3/Vehicles/biggun_info.h"
#include "Objects/TR3/Vehicles/kayak_info.h"
#include "Objects/TR3/Vehicles/quad_info.h"
#include "Objects/TR3/Vehicles/rubberboat_info.h"
#include "Objects/TR3/Vehicles/upv_info.h"
#include "Objects/TR4/Vehicles/jeep_info.h"
#include "Objects/TR4/Vehicles/motorbike_info.h"
#include "Objects/TR4/Entity/tr4_wraith_info.h"
#include "Objects/TR5/Entity/tr5_laserhead_info.h"
#include "Objects/TR5/Object/tr5_pushableblock_info.h"
#include "Specific/phd_global.h"
template<class... Ts> struct visitor : Ts... { using Ts::operator()...; }; template<class... Ts> struct visitor : Ts... { using Ts::operator()...; };
template<class... Ts> visitor(Ts...)->visitor<Ts...>; // line not needed in C++20... template<class... Ts> visitor(Ts...)->visitor<Ts...>; // line not needed in C++20...

7
TR5Main/Game/items.cpp
View file

@ -1,11 +1,12 @@
#include "framework.h" #include "framework.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/collision/floordata.h" #include "Game/collision/floordata.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"
using namespace TEN::Floordata; using namespace TEN::Floordata;

4
TR5Main/Game/items.h
View file

@ -2,10 +2,10 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>
#include "Specific/phd_global.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "itemdata/itemdata.h" #include "Game/itemdata/itemdata.h"
#include "Specific/newtypes.h" #include "Specific/newtypes.h"
#include "Specific/phd_global.h"
enum GAME_OBJECT_ID : short; enum GAME_OBJECT_ID : short;

7
TR5Main/Game/misc.cpp
View file

@ -1,11 +1,12 @@
#include "framework.h" #include "framework.h"
#include "Game/misc.h" #include "Game/misc.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara.h"
#include "Game/itemdata/creature_info.h" #include "Game/itemdata/creature_info.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/setup.h"
#include "Specific/level.h"
using std::vector; using std::vector;

1
TR5Main/Game/misc.h
View file

@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Game/control/box.h" #include "Game/control/box.h"
#define CHK_ANY(var, flag) (var & flag) != 0 #define CHK_ANY(var, flag) (var & flag) != 0

13
TR5Main/Game/missile.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h" #include "framework.h"
#include "missile.h" #include "Game/missile.h"
#include "Sound/sound.h"
#include "Game/items.h"
#include "Game/effects/effects.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/collision/collide_item.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Game/items.h"
#include "Sound/sound.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Specific/setup.h" #include "Specific/setup.h"
#include "Game/Lara/lara.h"
#include "Game/collision/collide_item.h"
#define SHARD_DAMAGE 30 #define SHARD_DAMAGE 30
#define ROCKET_DAMAGE 100 #define ROCKET_DAMAGE 100

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

@ -1,5 +1,6 @@
#include "framework.h" #include "framework.h"
#include "Game/particle/SimpleParticle.h" #include "Game/particle/SimpleParticle.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "Specific/setup.h" #include "Specific/setup.h"

2
TR5Main/Game/particle/SimpleParticle.h
View file

@ -3,7 +3,7 @@
#include <unordered_map> #include <unordered_map>
#include <d3d11.h> #include <d3d11.h>
#include <SimpleMath.h> #include <SimpleMath.h>
#include <Objects\objectslist.h> #include "Objects\objectslist.h"
struct ITEM_INFO; struct ITEM_INFO;
namespace TEN::Effects{ namespace TEN::Effects{

7
TR5Main/Game/people.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h" #include "framework.h"
#include "Game/people.h" #include "Game/people.h"
#include "Game/effects/effects.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/control/los.h" #include "Game/control/los.h"
#include "Game/collision/sphere.h" #include "Game/collision/sphere.h"
#include "Game/effects/effects.h"
#include "Game/effects/debris.h" #include "Game/effects/debris.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h" #include "Game/itemdata/creature_info.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
int ShotLara(ITEM_INFO* item, AI_INFO* info, BITE_INFO* gun, short extra_rotation, int damage) int ShotLara(ITEM_INFO* item, AI_INFO* info, BITE_INFO* gun, short extra_rotation, int damage)
{ {

1
TR5Main/Game/people.h
View file

@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Game/control/box.h" #include "Game/control/box.h"
constexpr auto MAX_VISIBILITY_DISTANCE = WALL_SIZE * 8; constexpr auto MAX_VISIBILITY_DISTANCE = WALL_SIZE * 8;

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

@ -1,31 +1,32 @@
#include "framework.h" #include "framework.h"
#include "Game/pickup/pickup.h" #include "Game/pickup/pickup.h"
#include "Specific/phd_global.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/gui.h" #include "Game/camera.h"
#include "Game/room.h" #include "Game/collision/collide_item.h"
#include "Game/effects/debris.h" #include "Game/effects/debris.h"
#include "Game/health.h" #include "Game/gui.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/health.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h" #include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara_flare.h" #include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_helpers.h" #include "Game/Lara/lara_helpers.h"
#include "Game/Lara/lara_one_gun.h" #include "Game/Lara/lara_one_gun.h"
#include "Game/Lara/lara_two_guns.h" #include "Game/Lara/lara_two_guns.h"
#include "Specific/setup.h"
#include "Game/camera.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Sound/sound.h"
#include "tr4_clockwork_beetle.h"
#include "Game/pickup/pickup_ammo.h" #include "Game/pickup/pickup_ammo.h"
#include "Game/pickup/pickup_key_items.h" #include "Game/pickup/pickup_key_items.h"
#include "Game/pickup/pickup_weapon.h" #include "Game/pickup/pickup_weapon.h"
#include "Game/pickup/pickup_consumable.h" #include "Game/pickup/pickup_consumable.h"
#include "Game/pickup/pickup_misc_items.h" #include "Game/pickup/pickup_misc_items.h"
#include "Game/room.h"
#include "Objects/Generic/Object/burning_torch.h" #include "Objects/Generic/Object/burning_torch.h"
#include "Game/collision/collide_item.h" #include "Objects/TR4/Object/tr4_clockwork_beetle.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Specific/phd_global.h"
#include "Specific/setup.h"
using namespace TEN::Entities::Generic; using namespace TEN::Entities::Generic;

5
TR5Main/Game/pickup/pickup_ammo.cpp
View file

@ -1,9 +1,10 @@
#include "framework.h" #include "framework.h"
#include <array>
#include "Game/pickup/pickup_ammo.h" #include "Game/pickup/pickup_ammo.h"
#include "Objects/objectslist.h"
#include <array>
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
#include "Game/pickup/pickuputil.h" #include "Game/pickup/pickuputil.h"
#include "Objects/objectslist.h"
struct AmmoPickupInfo struct AmmoPickupInfo
{ {

6
TR5Main/Game/pickup/pickup_consumable.cpp
View file

@ -1,10 +1,10 @@
#pragma once
#include "framework.h" #include "framework.h"
#include <array>
#include "Game/pickup/pickup_consumable.h" #include "Game/pickup/pickup_consumable.h"
#include "Objects/objectslist.h"
#include <array>
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
#include "Game/pickup/pickuputil.h" #include "Game/pickup/pickuputil.h"
#include "Objects/objectslist.h"
struct ConsumablePickupInfo struct ConsumablePickupInfo
{ {

4
TR5Main/Game/pickup/pickup_key_items.cpp
View file

@ -1,6 +1,8 @@
#include "framework.h" #include "framework.h"
#include "Game/pickup/pickup_misc_items.h" #include "Game/pickup/pickup_key_items.h"
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
#include "Game/pickup/pickup_misc_items.h"
#include "Objects/objectslist.h" #include "Objects/objectslist.h"
template <size_t N> struct KeyPickupInfo template <size_t N> struct KeyPickupInfo

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

@ -1,9 +1,10 @@
#include "framework.h" #include "framework.h"
#include <array>
#include "Game/pickup/pickup_misc_items.h" #include "Game/pickup/pickup_misc_items.h"
#include "Objects/objectslist.h"
#include <array>
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
#include "Game/pickup/pickuputil.h" #include "Game/pickup/pickuputil.h"
#include "Objects/objectslist.h"
auto SilencerIsEquipped(LaraInfo& lara) auto SilencerIsEquipped(LaraInfo& lara)
{ {

7
TR5Main/Game/pickup/pickup_weapon.cpp
View file

@ -1,10 +1,11 @@
#include "framework.h" #include "framework.h"
#include <array>
#include "Game/pickup/pickup_weapon.h" #include "Game/pickup/pickup_weapon.h"
#include "Objects/objectslist.h"
#include "Game/pickup/pickup_ammo.h" #include <array>
#include "Game/Lara/lara_struct.h" #include "Game/Lara/lara_struct.h"
#include "Game/pickup/pickuputil.h" #include "Game/pickup/pickuputil.h"
#include "Game/pickup/pickup_ammo.h"
#include "Objects/objectslist.h"
struct WeaponPickupInfo struct WeaponPickupInfo
{ {

3
TR5Main/Game/room.cpp
View file

@ -1,10 +1,11 @@
#include "framework.h" #include "framework.h"
#include "Game/room.h" #include "Game/room.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/control/lot.h" #include "Game/control/lot.h"
#include "Game/control/volume.h" #include "Game/control/volume.h"
#include "Renderer/Renderer11.h"
#include "Game/items.h" #include "Game/items.h"
#include "Renderer/Renderer11.h"
using namespace TEN::Renderer; using namespace TEN::Renderer;
using namespace TEN::Floordata; using namespace TEN::Floordata;

4
TR5Main/Game/room.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <framework.h> #include "framework.h"
#include "Specific/newtypes.h"
#include "Game/collision/floordata.h" #include "Game/collision/floordata.h"
#include "Specific/newtypes.h"
#include "Specific/phd_global.h" #include "Specific/phd_global.h"
struct TRIGGER_VOLUME; struct TRIGGER_VOLUME;

38
TR5Main/Game/savegame.cpp
View file

@ -1,31 +1,31 @@
#include "framework.h" #include "framework.h"
#include "Game/savegame.h" #include "Game/savegame.h"
#include "Game/Lara/lara.h"
#include "Game/items.h" #include <filesystem>
#include "Game/control/box.h"
#include "Game/control/lot.h"
#include "Game/spotcam.h"
#include "Objects/Generic/Traps/traps.h"
#include "Game/collision/floordata.h" #include "Game/collision/floordata.h"
#include "Game/room.h" #include "Game/control/box.h"
#include "sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Sound/sound.h"
#include "Game/control/flipeffect.h" #include "Game/control/flipeffect.h"
#include "Game/control/lot.h"
#include "Game/effects/lara_fx.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Game/misc.h"
#include "Game/spotcam.h"
#include "Game/room.h"
#include "Objects/Generic/Object/rope.h"
#include "Objects/Generic/Switches/fullblock_switch.h"
#include "Objects/Generic/Traps/traps.h"
#include "Objects/Generic/puzzles_keys.h"
#include "Objects/TR4/Entity/tr4_littlebeetle.h"
#include "Objects/TR5/Emitter/tr5_rats_emitter.h" #include "Objects/TR5/Emitter/tr5_rats_emitter.h"
#include "Objects/TR5/Emitter/tr5_bats_emitter.h" #include "Objects/TR5/Emitter/tr5_bats_emitter.h"
#include "Objects/TR5/Emitter/tr5_spider_emitter.h" #include "Objects/TR5/Emitter/tr5_spider_emitter.h"
#include "fullblock_switch.h" #include "Sound/sound.h"
#include "Game/itemdata/creature_info.h" #include "Specific/level.h"
#include "Game/effects/lara_fx.h" #include "Specific/setup.h"
#include "Specific/savegame/flatbuffers/ten_savegame_generated.h" #include "Specific/savegame/flatbuffers/ten_savegame_generated.h"
#include "Game/misc.h"
#include "Objects/Generic/puzzles_keys.h"
#include "Objects/TR4/Entity/tr4_littlebeetle.h"
#include "Objects/Generic/Object/rope.h"
#include <filesystem>
using namespace TEN::Effects::Lara; using namespace TEN::Effects::Lara;
using namespace TEN::Entities::Switches; using namespace TEN::Entities::Switches;

4
TR5Main/Game/savegame.h
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Scripting/GameFlowScript.h"
#include "Scripting/GameLogicScript.h"
#include "Specific/IO/ChunkId.h" #include "Specific/IO/ChunkId.h"
#include "Specific/IO/ChunkReader.h" #include "Specific/IO/ChunkReader.h"
#include "Specific/IO/ChunkWriter.h" #include "Specific/IO/ChunkWriter.h"
#include "Specific/IO/LEB128.h" #include "Specific/IO/LEB128.h"
#include "Specific/IO/Streams.h" #include "Specific/IO/Streams.h"
#include "Scripting/GameFlowScript.h"
#include "Scripting/GameLogicScript.h"
constexpr auto SAVEGAME_MAX = 16; constexpr auto SAVEGAME_MAX = 16;

7
TR5Main/Game/spotcam.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h" #include "framework.h"
#include "Game/spotcam.h" #include "Game/spotcam.h"
#include "Game/animation.h"
#include "Game/camera.h" #include "Game/camera.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/animation.h" #include "Game/control/volume.h"
#include "Game/effects/tomb4fx.h" #include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara.h" #include "Game/Lara/lara.h"
#include "Specific/input.h" #include "Specific/input.h"
#include "Game/control/volume.h"
#include "Game/items.h"
using namespace TEN::Renderer; using namespace TEN::Renderer;
using namespace TEN::Control::Volumes; using namespace TEN::Control::Volumes;

10
TR5Main/Game/text.cpp
View file

@ -1,10 +0,0 @@
#include "framework.h"
#include "Game/text.h"
#include "Game/animation.h"
#include "Renderer/Renderer11.h"
namespace TEN::Renderer {
void PrintString(int x, int y, int unk1, char* string, int unk2) {
g_Renderer.drawString(x, y, string, D3DCOLOR_RGBA(0xFF, 0xFF, 0xFF, 255), 0);
}
}

4
TR5Main/Game/text.h
View file

@ -1,4 +0,0 @@
#pragma once
#include "Game/animation.h"
void PrintString(int x, int y, int unk1, char* string, int unk2);

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

@ -1,8 +1,8 @@
#include "framework.h" #include "framework.h"
#include "Objects/Effects/effect_objects.h" #include "Objects/Effects/effect_objects.h"
#include "Specific/setup.h"
#include "Objects/Effects/flame_emitters.h" #include "Objects/Effects/flame_emitters.h"
#include "Objects/Effects/enemy_missile.h" #include "Objects/Effects/enemy_missile.h"
#include "Specific/setup.h"
using namespace TEN::Entities::Effects; using namespace TEN::Entities::Effects;

16
TR5Main/Objects/Effects/enemy_missile.cpp
View file

@ -1,16 +1,16 @@
#include "framework.h" #include "framework.h"
#include "Objects/Effects/enemy_missile.h"
#include "Game/effects/debris.h"
#include "Game/items.h"
#include "Game/effects/tomb4fx.h"
#include "Game/effects/effects.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/Control/control.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Game/control/control.h"
#include "Game/effects/debris.h"
#include "Game/effects/effects.h"
#include "Game/effects/lara_fx.h" #include "Game/effects/lara_fx.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Objects/Effects/enemy_missile.h"
#include "Objects/TR4/Entity/tr4_mutant.h" #include "Objects/TR4/Entity/tr4_mutant.h"
#include "Objects/TR4/Entity/tr4_demigod.h" #include "Objects/TR4/Entity/tr4_demigod.h"
#include "Specific/level.h"
using namespace TEN::Effects::Lara; using namespace TEN::Effects::Lara;
using namespace TEN::Entities::TR4; using namespace TEN::Entities::TR4;

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

@ -1,19 +1,19 @@
#include "framework.h" #include "framework.h"
#include "Objects/Effects/flame_emitters.h"
#include "Sound/sound.h"
#include "Specific/trmath.h"
#include "Game/collision/sphere.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/effects/tomb4fx.h"
#include "Game/collision/collide_item.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/collision/collide_item.h"
#include "Game/collision/sphere.h"
#include "Game/effects/effects.h" #include "Game/effects/effects.h"
#include "Game/effects/weather.h"
#include "Specific/setup.h"
#include "Game/effects/lightning.h" #include "Game/effects/lightning.h"
#include "Game/effects/lara_fx.h" #include "Game/effects/lara_fx.h"
#include "Game/effects/tomb4fx.h"
#include "Game/effects/weather.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Objects/Effects/flame_emitters.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/trmath.h"
using namespace TEN::Effects::Lara; using namespace TEN::Effects::Lara;
using namespace TEN::Effects::Lightning; using namespace TEN::Effects::Lightning;

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

@ -1,14 +1,14 @@
#include "framework.h" #include "framework.h"
#include "Game/animation.h"
#include "Game/collision/collide_item.h"
#include "Game/collision/sphere.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Objects/Effects/tr4_locusts.h" #include "Objects/Effects/tr4_locusts.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Specific/trmath.h"
#include "Game/collision/sphere.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Game/Lara/lara.h" #include "Specific/trmath.h"
#include "Game/effects/tomb4fx.h"
#include "Game/collision/collide_item.h"
#include "Game/animation.h"
#include "Game/items.h"
namespace TEN::Entities::TR4 namespace TEN::Entities::TR4
{ {

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

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Specific/phd_global.h"
#include "Game/items.h" #include "Game/items.h"
#include "Specific/phd_global.h"
struct LOCUST_INFO struct LOCUST_INFO
{ {

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

@ -1,19 +1,19 @@
#include "framework.h" #include "framework.h"
#include "tr5_electricity.h"
#include "Game/effects/effects.h"
#include "Game/control/control.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/animation.h" #include "Game/animation.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_collide.h"
#include "Game/collision/collide_room.h" #include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h" #include "Game/collision/collide_item.h"
#include "Sound/sound.h"
#include "Game/collision/sphere.h" #include "Game/collision/sphere.h"
#include "Objects/Generic/Traps/traps.h" #include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/effects/lara_fx.h" #include "Game/effects/lara_fx.h"
#include "Game/items.h" #include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_collide.h"
#include "Objects/Effects/tr5_electricity.h"
#include "Objects/Generic/Traps/traps.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
using namespace TEN::Effects::Lara; using namespace TEN::Effects::Lara;

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

@ -1,5 +1,5 @@
#include "framework.h" #include "framework.h"
#include "generic_doors.h" #include "Objects/Generic/Doors/generic_doors.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/control/box.h" #include "Game/control/box.h"

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

@ -1,5 +1,5 @@
#include "framework.h" #include "framework.h"
#include "generic_doors.h" #include "Objects/Generic/Doors/generic_doors.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/control/box.h" #include "Game/control/box.h"

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

@ -1,5 +1,5 @@
#include "framework.h" #include "framework.h"
#include "generic_doors.h" #include "Objects/Generic/Doors/generic_doors.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/control/box.h" #include "Game/control/box.h"

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

@ -1,5 +1,5 @@
#include "framework.h" #include "framework.h"
#include "generic_doors.h" #include "Objects/Generic/Doors/generic_doors.h"
#include "Specific/level.h" #include "Specific/level.h"
#include "Game/control/control.h" #include "Game/control/control.h"
#include "Game/control/box.h" #include "Game/control/box.h"
@ -16,7 +16,7 @@
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "Game/misc.h" #include "Game/misc.h"
#include "sequence_door.h" #include "sequence_door.h"
#include "fullblock_switch.h" #include "Objects/Generic/Switches/fullblock_switch.h"
#include "Game/itemdata/door_data.h" #include "Game/itemdata/door_data.h"
using namespace TEN::Entities::Switches; using namespace TEN::Entities::Switches;

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