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

Reorganize includes tier 4

Browse source
This commit is contained in:
Lwmte 2021-12-24 11:08:16 +03:00
parent b71fa516f2
commit b86d3b872c
110 changed files with 574 additions and 520 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@
#include "Game/Lara/lara.h"
#include "Specific/trmath.h"
#include "Game/misc.h"
#include "double_doors.h"
#include "Objects/Generic/Doors/double_doors.h"
#include "Game/collision/collide_item.h"
namespace TEN::Entities::Doors

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

@ -11,7 +11,7 @@
#include "Sound/sound.h"
#include "Game/animation.h"
#include "Game/collision/sphere.h"
#include "cog_switch.h"
#include "Objects/Generic/Switches/cog_switch.h"
#include "Objects/objectslist.h"
#include "Game/Lara/lara_struct.h"
#include "Game/Lara/lara.h"

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

@ -15,7 +15,7 @@
#include "Game/Lara/lara.h"
#include "Specific/trmath.h"
#include "Game/misc.h"
#include "pushpull_kick_door.h"
#include "Objects/Generic/Doors/pushpull_kick_door.h"
#include "Game/collision/collide_item.h"
#include "Game/itemdata/door_data.h"

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

@ -15,7 +15,7 @@
#include "Game/Lara/lara.h"
#include "Specific/trmath.h"
#include "Game/misc.h"
#include "sequence_door.h"
#include "Objects/Generic/Doors/sequence_door.h"
#include "Objects/Generic/Switches/fullblock_switch.h"
#include "Game/itemdata/door_data.h"

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

@ -15,7 +15,7 @@
#include "Game/Lara/lara.h"
#include "Specific/trmath.h"
#include "Game/misc.h"
#include "steel_door.h"
#include "Objects/Generic/Doors/steel_door.h"
#include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h"

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

@ -15,7 +15,7 @@
#include "Game/Lara/lara.h"
#include "Specific/trmath.h"
#include "Game/misc.h"
#include "underwater_door.h"
#include "Objects/Generic/Doors/underwater_door.h"
#include "Game/collision/collide_item.h"
namespace TEN::Entities::Doors

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

@ -1,6 +1,6 @@
#include "framework.h"
#include "Specific/level.h"
#include "generic_bridge.h"
#include "Objects/Generic/Object/generic_bridge.h"
#include "Game/collision/floordata.h"
using namespace TEN::Floordata;

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

@ -1,5 +1,5 @@
#include "framework.h"
#include "generic_trapdoor.h"
#include "Objects/Generic/Object/generic_trapdoor.h"
#include "Game/Lara/lara.h"
#include "Game/collision/floordata.h"
#include "Specific/input.h"

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

@ -1,5 +1,5 @@
#include "framework.h"
#include "cog_switch.h"
#include "Objects/Generic/Switches/cog_switch.h"
#include "Game/control/control.h"
#include "Specific/input.h"
#include "Game/Lara/lara.h"

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

@ -2,7 +2,7 @@
#include "Objects/Generic/Switches/generic_switch.h"
#include "Specific/input.h"
#include "Game/Lara/lara.h"
#include "crowbar_switch.h"
#include "Objects/Generic/Switches/crowbar_switch.h"
#include "Game/gui.h"
#include "Sound/sound.h"
#include "Game/pickup/pickup.h"

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

@ -1,5 +1,5 @@
#include "framework.h"
#include "jump_switch.h"
#include "Objects/Generic/Switches/jump_switch.h"
#include "Game/control/control.h"
#include "Specific/input.h"
#include "Game/Lara/lara.h"

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

@ -1,5 +1,5 @@
#include "framework.h"
#include "pulley_switch.h"
#include "Objects/Generic/Switches/pulley_switch.h"
#include "Game/control/control.h"
#include "Specific/input.h"
#include "Game/Lara/lara.h"

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

@ -1,5 +1,5 @@
#include "framework.h"
#include "rail_switch.h"
#include "Objects/Generic/Switches/rail_switch.h"
#include "Specific/input.h"
#include "Game/Lara/lara.h"
#include "Objects/Generic/Switches/generic_switch.h"

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

@ -1,5 +1,5 @@
#include "framework.h"
#include "turn_switch.h"
#include "Objects/Generic/Switches/turn_switch.h"
#include "Game/control/control.h"
#include "Specific/input.h"
#include "Game/Lara/lara.h"

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

@ -1,7 +1,7 @@
#include "framework.h"
#include "Specific/input.h"
#include "Game/Lara/lara.h"
#include "underwater_switch.h"
#include "Objects/Generic/Switches/underwater_switch.h"
#include "Objects/Generic/Switches/generic_switch.h"
#include "Game/camera.h"
#include "Game/collision/collide_item.h"

42
TR5Main/Objects/Generic/generic_objects.cpp
View file

@ -1,41 +1,41 @@
#include "framework.h"
#include "Objects/Generic/generic_objects.h"
#include "Game/pickup/pickup.h"
#include "Game/collision/collide_item.h"
// objects
#include "generic_trapdoor.h"
#include "generic_bridge.h"
#include "Objects/Generic/Object/generic_trapdoor.h"
#include "Objects/Generic/Object/generic_bridge.h"
#include "Objects/Generic/Object/burning_torch.h"
#include "Objects/Generic/Object/polerope.h"
#include "Objects/Generic/Object/rope.h"
// switches
#include "cog_switch.h"
#include "rail_switch.h"
#include "jump_switch.h"
#include "Objects/Generic/Switches/cog_switch.h"
#include "Objects/Generic/Switches/rail_switch.h"
#include "Objects/Generic/Switches/jump_switch.h"
#include "Objects/Generic/Switches/generic_switch.h"
#include "crowbar_switch.h"
#include "underwater_switch.h"
#include "pulley_switch.h"
#include "Objects/Generic/Switches/crowbar_switch.h"
#include "Objects/Generic/Switches/underwater_switch.h"
#include "Objects/Generic/Switches/pulley_switch.h"
#include "Objects/Generic/Switches/fullblock_switch.h"
#include "turn_switch.h"
#include "Objects/Generic/Switches/turn_switch.h"
// Doors
#include "Objects/Generic/Doors/generic_doors.h"
#include "double_doors.h"
#include "pushpull_kick_door.h"
#include "sequence_door.h"
#include "steel_door.h"
#include "underwater_door.h"
#include "Objects/Generic/Doors/double_doors.h"
#include "Objects/Generic/Doors/pushpull_kick_door.h"
#include "Objects/Generic/Doors/sequence_door.h"
#include "Objects/Generic/Doors/steel_door.h"
#include "Objects/Generic/Doors/underwater_door.h"
// Traps
#include "Objects/Generic/Traps/dart_emitter.h"
#include "Objects/Generic/Object/polerope.h"
#include "Objects/Generic/Object/rope.h"
/// necessary import
/// Necessary import
#include "Specific/setup.h"
#include "Game/pickup/pickup.h"
#include "Game/collision/collide_item.h"
#include "Objects/Generic/Object/burning_torch.h"
using namespace TEN::Entities::Switches;
using namespace TEN::Entities::Doors;

19
TR5Main/Objects/Generic/puzzles_keys.cpp
View file

@ -1,17 +1,18 @@
#include "framework.h"
#include "Objects/Generic/puzzles_keys.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_item.h"
#include "Game/control/control.h"
#include "Game/gui.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/pickup/pickup.h"
#include "Objects/Generic/Switches/generic_switch.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/Lara/lara.h"
#include "Game/gui.h"
#include "Game/pickup/pickup.h"
#include "Game/animation.h"
#include "Game/control/control.h"
#include "puzzles_keys.h"
#include "Objects/Generic/Switches/generic_switch.h"
#include "Game/camera.h"
#include "Game/items.h"
using namespace TEN::Entities::Switches;

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

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr1_ape.h"
#include "Objects/TR1/Entity/tr1_ape.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO apeBite = { 0, -19, 75, 15 };

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

@ -1,14 +1,14 @@
#include "framework.h"
#include "tr1_bear.h"
#include "Objects/TR1/Entity/tr1_bear.h"
#include "Game/control/box.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO bearBite = { 0, 96, 335, 14 };

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

@ -1,14 +1,15 @@
#include "framework.h"
#include "tr1_bigrat.h"
#include "Objects/TR1/Entity/tr1_bigrat.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Game/misc.h"
#include "people.h"
#include "Specific/setup.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/misc.h"
#include "Game/people.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#define BIG_RAT_RUN_TURN ANGLE(6.0f)
#define BIG_RAT_SWIM_TURN ANGLE(3.0f)

21
TR5Main/Objects/TR1/Entity/tr1_centaur.cpp
View file

@ -1,16 +1,17 @@
#include "framework.h"
#include "Game/control/box.h"
#include "Game/items.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "people.h"
#include "Sound/sound.h"
#include "Game/effects/tomb4fx.h"
#include "tr1_centaur.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/effects/effects.h"
#include "Objects/TR1/Entity/tr1_centaur.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "Game/collision/collide_item.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/people.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
enum centaur_anims {

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

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr1_doppelganger.h"
#include "Objects/TR1/Entity/tr1_doppelganger.h"
#include "Game/animation.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h"
#include "Game/misc.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/control/control.h"
#include "Game/animation.h"
// TODO: Evil lara is not targetable and cant move like lara.

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

@ -1,15 +1,17 @@
#include "framework.h"
#include "Objects/TR1/Entity/tr1_giant_mutant.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/camera.h"
#include "Specific/setup.h"
#include "Game/effects/tomb4fx.h"
#include "Specific/level.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Game/animation.h"
#include "Specific/level.h"
#include "Specific/setup.h"
enum abortion_anims {
ABORT_EMPTY, ABORT_STOP, ABORT_TURNL, ABORT_TURNR, ABORT_ATTACK1, ABORT_ATTACK2,

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

@ -1,14 +1,15 @@
#include "framework.h"
#include "tr1_natla.h"
#include "Objects/TR1/Entity/tr1_natla.h"
#include "Game/control/box.h"
#include "people.h"
#include "Game/itemdata/creature_info.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/missile.h"
#include "Specific/level.h"
#include "Game/people.h"
#include "Sound/sound.h"
#include "Game/effects/effects.h"
#include "Specific/level.h"
#include "Specific/trmath.h"
#include "Game/itemdata/creature_info.h"
#define NATLA_NEAR_DEATH 200

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

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr1_wolf.h"
#include "Game/items.h"
#include "Objects/TR1/Entity/tr1_wolf.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Game/control/control.h"
#include "Specific/level.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO wolfBite = { 0, -14, 174, 6 };

24
TR5Main/Objects/TR1/tr1_objects.cpp
View file

@ -1,25 +1,23 @@
#include "framework.h"
#include "Objects/TR1/tr1_objects.h"
/// entities
#include "tr1_ape.h" // OK
#include "tr1_bear.h" // OK
#include "tr1_doppelganger.h" // OK
#include "tr1_natla.h" // OK
#include "tr1_giant_mutant.h" // OK
#include "tr1_wolf.h" // OK
#include "tr1_bigrat.h" // OK
#include "tr1_centaur.h"
/// objects
/// traps
/// necessary import
#include "Game/control/box.h"
#include "Game/collision/collide_item.h"
#include "Game/itemdata/creature_info.h"
#include "Specific/setup.h"
#include "Specific/level.h"
/// entities
#include "Objects/TR1/Entity/tr1_ape.h" // OK
#include "Objects/TR1/Entity/tr1_bear.h" // OK
#include "Objects/TR1/Entity/tr1_doppelganger.h" // OK
#include "Objects/TR1/Entity/tr1_natla.h" // OK
#include "Objects/TR1/Entity/tr1_giant_mutant.h" // OK
#include "Objects/TR1/Entity/tr1_wolf.h" // OK
#include "Objects/TR1/Entity/tr1_bigrat.h" // OK
#include "Objects/TR1/Entity/tr1_centaur.h"
#include "Objects/Utils/object_helper.h"
#include "Game/itemdata/creature_info.h"
static void StartBaddy(OBJECT_INFO* obj)
{

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

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr2_barracuda.h"
#include "Objects/TR2/Entity/tr2_barracuda.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO barracudaBite = { 2, -60, 121, 7 };

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

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr2_birdmonster.h"
#include "Objects/TR2/Entity/tr2_birdmonster.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO birdyBiteL = { 0, 224, 0, 19 };
BITE_INFO birdyBiteR = { 0, 224, 0, 22 };

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

@ -1,19 +1,20 @@
#include "framework.h"
#include "tr2_dragon.h"
#include "Game/Lara/lara.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Objects/TR2/Entity/tr2_dragon.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_item.h"
#include "Game/collision/sphere.h"
#include "Game/control/box.h"
#include "Game/control/lot.h"
#include "Game/collision/sphere.h"
#include "Game/camera.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/input.h"
#include "Game/animation.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#define DRAGON_SWIPE_DAMAGE 250
#define DRAGON_TOUCH_DAMAGE 10
@ -41,7 +42,8 @@
BITE_INFO dragonMouthBite = { 35, 171, 1168, 12 };
enum DRAGON_STATE {
enum DRAGON_STATE
{
DRAGON_EMPTY,
DRAGON_WALK,
DRAGON_LEFT,

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

@ -1,6 +1,6 @@
#pragma once
#include "Game/items.h"
#include "Game/collision/collide_room.h"
#include "Game/items.h"
void DragonCollision(short itemNum, ITEM_INFO* laraitem, COLL_INFO* coll);
void DragonControl(short backNum);

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

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

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

@ -1,16 +1,17 @@
#include "framework.h"
#include "tr2_knifethrower.h"
#include "Game/items.h"
#include "Game/effects/effects.h"
#include "Game/control/box.h"
#include "people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Objects/TR2/Entity/tr2_knifethrower.h"
#include "Game/collision/floordata.h"
#include "Game/collision/collide_item.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/people.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Sound/sound.h"
BITE_INFO knifeLeft = { 0, 0, 0, 5 };
BITE_INFO knifeRight = { 0, 0, 0, 8 };

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

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr2_mercenary.h"
#include "Objects/TR2/Entity/tr2_mercenary.h"
#include "Game/control/box.h"
#include "people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Specific/trmath.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/people.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/trmath.h"
BITE_INFO mercUziBite = { 0, 150, 19, 17 };
BITE_INFO mercAutoPistolBite = { 0, 230, 9, 17 };

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

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr2_monk.h"
#include "Objects/TR2/Entity/tr2_monk.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO monkBite = { -23,16,265, 14 };

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

@ -1,14 +1,14 @@
#include "framework.h"
#include "tr2_rat.h"
#include "Game/Lara/lara.h"
#include "Objects/TR2/Entity/tr2_rat.h"
#include "Game/control/box.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Specific/setup.h"
#include "Game/control/control.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO ratBite = { 0, 0, 57, 2 };

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

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr2_shark.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Objects/TR2/Entity/tr2_shark.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO sharkBite = { 17, -22, 344, 12 };

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

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr2_silencer.h"
#include "Objects/TR2/Entity/tr2_silencer.h"
#include "Game/control/box.h"
#include "people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/people.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO silencerGun = { 3, 331, 56, 10 };

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

@ -1,19 +1,20 @@
#include "framework.h"
#include "tr2_skidman.h"
#include "Objects/TR2/Entity/tr2_skidman.h"
#include "Game/animation.h"
#include "Game/items.h"
#include "Game/collision/collide_item.h"
#include "Game/Lara/lara.h"
#include "Game/control/lot.h"
#include "Game/control/box.h"
#include "people.h"
#include "Game/collision/sphere.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Sound/sound.h"
#include "Objects/TR2/Vehicles/snowmobile.h"
#include "Game/control/box.h"
#include "Game/control/lot.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Game/people.h"
#include "Objects/TR2/Vehicles/snowmobile.h"
#include "Objects/TR2/Vehicles/skidoo_info.h"
#include "Game/animation.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
enum SKIDMAN_STATE { SMAN_EMPTY, SMAN_WAIT, SMAN_MOVING, SMAN_STARTLEFT, SMAN_STARTRIGHT, SMAN_LEFT, SMAN_RIGHT, SMAN_DEATH };

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

@ -1,6 +1,6 @@
#pragma once
#include "Game/items.h"
#include "Game/collision/collide_room.h"
#include "Game/items.h"
void InitialiseSkidman(short itemNum);
void SkidManCollision(short itemNum, ITEM_INFO* laraitem, COLL_INFO* coll);

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

@ -1,14 +1,15 @@
#include "framework.h"
#include "Objects/TR2/Entity/tr2_spear_guardian.h"
#include "Game/animation.h"
#include "tr2_spear_guardian.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO spearLeftBite = { 0, 0, 920, 11 };
BITE_INFO spearRightBite = { 0, 0, 920, 18 };

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

@ -1,16 +1,17 @@
#include "framework.h"
#include "tr2_spider.h"
#include "Game/effects/effects.h"
#include "Game/control/box.h"
#include "Game/items.h"
#include "Game/control/lot.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Game/effects/tomb4fx.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Objects/TR2/Entity/tr2_spider.h"
#include "Game/animation.h"
#include "Game/control/control.h"
#include "Game/control/box.h"
#include "Game/control/lot.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO spiderBite = { 0, 0, 41, 1 };

9
TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp
View file

@ -1,15 +1,16 @@
#include "framework.h"
#include "tr2_sword_guardian.h"
#include "Objects/TR2/Entity/tr2_sword_guardian.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "Game/control/lot.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/effects/tomb4fx.h"
#include "Specific/level.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Specific/level.h"
BITE_INFO swordBite = { 0, 37, 550, 15 };

11
TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp
View file

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr2_worker_dualrevolver.h"
#include "Objects/TR2/Entity/tr2_worker_dualrevolver.h"
#include "Game/control/box.h"
#include "people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/people.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO workerDualGunL = { -2, 275, 23, 6 };
BITE_INFO workerDualGunR = { 2, 275, 23, 10 };

16
TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
View file

@ -1,18 +1,18 @@
#include "framework.h"
#include "tr2_worker_flamethrower.h"
#include "Objects/TR2/Entity/tr2_worker_flamethrower.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "people.h"
#include "Game/items.h"
#include "Game/missile.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/missile.h"
#include "Game/people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/animation.h"
#include "Game/effects/effects.h"
#include "Specific/trmath.h"
#include "Game/itemdata/creature_info.h"
BITE_INFO workerFlameThrower = { 0, 250, 32, 9 };

11
TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr2_worker_machinegun.h"
#include "Objects/TR2/Entity/tr2_worker_machinegun.h"
#include "Game/animation.h"
#include "people.h"
#include "Game/control/box.h"
#include "Game/items.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/people.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO workerMachineGun = { 0, 308, 32, 9 };

11
TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr2_worker_shotgun.h"
#include "Objects/TR2/Entity/tr2_worker_shotgun.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "people.h"
#include "Game/items.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/people.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO workerShotgun = { 0, 281, 40, 9 };

11
TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr2_yeti.h"
#include "Objects/TR2/Entity/tr2_yeti.h"
#include "Game/control/box.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO yetiBiteR = { 12, 101, 19, 10 };
BITE_INFO yetiBiteL = { 12, 101, 19, 13 };

13
TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp
View file

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr2_killerstatue.h"
#include "Objects/TR2/Trap/tr2_killerstatue.h"
#include "Game/animation.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h"
#include "Game/effects/effects.h"
#include "Game/animation.h"
#include "Game/items.h"
void InitialiseKillerStatue(short itemNumber)
{

17
TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr2_spinningblade.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Game/effects/effects.h"
#include "Sound/sound.h"
#include "Game/items.h"
#include "Objects/TR2/Trap/tr2_spinningblade.h"
#include "Game/animation.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
void InitialiseSpinningBlade(short itemNumber)
{

7
TR5Main/Objects/TR2/Trap/tr2_springboard.cpp
View file

@ -1,9 +1,10 @@
#include "framework.h"
#include "tr2_springboard.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Objects/TR2/Trap/tr2_springboard.h"
#include "Game/animation.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
void SpringBoardControl(short itemNumber)
{

19
TR5Main/Objects/TR2/Vehicles/boat.cpp
View file

@ -1,18 +1,19 @@
#include "framework.h"
#include "boat.h"
#include "Game/Lara/lara.h"
#include "Game/items.h"
#include "Objects/TR2/Vehicles/boat.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_item.h"
#include "Game/collision/sphere.h"
#include "Game/camera.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Game/animation.h"
#include "Sound/sound.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/particle/SimpleParticle.h"
#include "Objects/TR2/Vehicles/boat_info.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
enum SpeedBoatState
{

2
TR5Main/Objects/TR2/Vehicles/boat.h
View file

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

3
TR5Main/Objects/TR2/Vehicles/skidoo_info.h
View file

@ -1,6 +1,7 @@
#pragma once
struct SKIDOO_INFO {
struct SKIDOO_INFO
{
short trackMesh;
int skidooTurn;
int leftFallspeed;

31
TR5Main/Objects/TR2/Vehicles/snowmobile.cpp
View file

@ -1,23 +1,24 @@
#include "framework.h"
#include "Objects/TR2/Vehicles/snowmobile.h"
#include "Game/Lara/lara.h"
#include "Game/items.h"
#include "Game/collision/collide_item.h"
#include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara_flare.h"
#include "Game/effects/tomb4fx.h"
#include "Game/collision/sphere.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Game/animation.h"
#include "Sound/sound.h"
#include "Game/particle/SimpleParticle.h"
#include "Specific/prng.h"
#include "Game/camera.h"
#include "Game/collision/collide_item.h"
#include "Game/collision/sphere.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_fire.h"
#include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/particle/SimpleParticle.h"
#include "Objects/TR2/Vehicles/skidoo_info.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/prng.h"
#include "Specific/setup.h"
#include "Sound/sound.h"
using std::vector;
using namespace TEN::Math::Random;

2
TR5Main/Objects/TR2/Vehicles/snowmobile.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Game/items.h"
#include "Game/collision/collide_room.h"
#include "Game/items.h"
void InitialiseSkidoo(short itemNum);
void SkidooCollision(short itemNum, ITEM_INFO* litem, COLL_INFO* coll);

53
TR5Main/Objects/TR2/tr2_objects.cpp
View file

@ -1,40 +1,39 @@
#include "framework.h"
#include "Objects/TR2/tr2_objects.h"
/// entities
#include "tr2_barracuda.h" // OK
#include "tr2_birdmonster.h" // OK
#include "tr2_dragon.h" // OK
#include "tr2_eagle_or_crow.h" // OK
#include "tr2_knifethrower.h" // OK
#include "tr2_mercenary.h" // OK
#include "tr2_monk.h" // OK
#include "tr2_rat.h" // OK
#include "tr2_shark.h" // OK
#include "tr2_silencer.h" // OK
#include "tr2_skidman.h" // OK
#include "tr2_spear_guardian.h" // OK
#include "tr2_spider.h" // OK
#include "tr2_sword_guardian.h" // OK
#include "tr2_worker_dualrevolver.h" // OK
#include "tr2_worker_flamethrower.h" // OK
#include "tr2_worker_machinegun.h" // OK
#include "tr2_worker_shotgun.h" // OK
#include "tr2_yeti.h" // OK
/// objects
/// entities
#include "Objects/TR2/Entity/tr2_barracuda.h" // OK
#include "Objects/TR2/Entity/tr2_birdmonster.h" // OK
#include "Objects/TR2/Entity/tr2_dragon.h" // OK
#include "Objects/TR2/Entity/tr2_eagle_or_crow.h" // OK
#include "Objects/TR2/Entity/tr2_knifethrower.h" // OK
#include "Objects/TR2/Entity/tr2_mercenary.h" // OK
#include "Objects/TR2/Entity/tr2_monk.h" // OK
#include "Objects/TR2/Entity/tr2_rat.h" // OK
#include "Objects/TR2/Entity/tr2_shark.h" // OK
#include "Objects/TR2/Entity/tr2_silencer.h" // OK
#include "Objects/TR2/Entity/tr2_skidman.h" // OK
#include "Objects/TR2/Entity/tr2_spear_guardian.h" // OK
#include "Objects/TR2/Entity/tr2_spider.h" // OK
#include "Objects/TR2/Entity/tr2_sword_guardian.h" // OK
#include "Objects/TR2/Entity/tr2_worker_dualrevolver.h" // OK
#include "Objects/TR2/Entity/tr2_worker_flamethrower.h" // OK
#include "Objects/TR2/Entity/tr2_worker_machinegun.h" // OK
#include "Objects/TR2/Entity/tr2_worker_shotgun.h" // OK
#include "Objects/TR2/Entity/tr2_yeti.h" // OK
/// trap
#include "tr2_spinningblade.h"
#include "tr2_springboard.h"
#include "tr2_killerstatue.h"
#include "Objects/TR2/Trap/tr2_spinningblade.h"
#include "Objects/TR2/Trap/tr2_springboard.h"
#include "Objects/TR2/Trap/tr2_killerstatue.h"
/// vehicles
#include "boat.h"
#include "Objects/TR2/Vehicles/boat.h"
#include "Objects/TR2/Vehicles/snowmobile.h"
/// necessary import
#include "Game/collision/collide_item.h"
#include "Game/control/box.h"
#include "Game/collision/collide_item.h"
#include "Game/itemdata/creature_info.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
static void StartBaddy(OBJECT_INFO* obj)
{

11
TR5Main/Objects/TR3/Entity/tr3_civvy.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h"
#include "tr3_civvy.h"
#include "Objects/TR3/Entity/tr3_civvy.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/people.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO civvy_hit = { 0,0,0, 13 };

7
TR5Main/Objects/TR3/Entity/tr3_cobra.cpp
View file

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr3_cobra.h"
#include "Objects/TR3/Entity/tr3_cobra.h"
#include "Game/control/box.h"
#include "Game/itemdata/creature_info.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Specific/setup.h"
BITE_INFO cobraBite = { 0, 0, 0, 13 };

9
TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
View file

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr3_fishemitter.h"
#include "Objects/TR3/Entity/tr3_fishemitter.h"
#include "Game/animation.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "fish.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Objects/TR3/fish.h"
#include "Specific/level.h"
#define PIRAHNA_DAMAGE 4
#define X 0

19
TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
View file

@ -1,16 +1,17 @@
#include "framework.h"
#include "tr3_flamethrower.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "people.h"
#include "Game/items.h"
#include "Objects/TR3/Entity/tr3_flamethrower.h"
#include "Game/animation.h"
#include "Specific/setup.h"
#include "Game/control/box.h"
#include "Game/control/lot.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Game/people.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO flamerBite = { 0, 340, 64, 7 };

13
TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h"
#include "tr3_monkey.h"
#include "Objects/TR3/Entity/tr3_monkey.h"
#include "Game/control/box.h"
#include "Game/Lara/lara.h"
#include "Game/control/control.h"
#include "Game/control/lot.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Specific/setup.h"
#include "Game/control/lot.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO monkeyBite = { 10, 10, 11, 13 };

17
TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp
View file

@ -1,17 +1,18 @@
#include "framework.h"
#include "tr3_mpgun.h"
#include "Objects/TR3/Entity/tr3_mpgun.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "Game/control/lot.h"
#include "Game/collision/sphere.h"
#include "Game/effects/effects.h"
#include "people.h"
#include "Specific/setup.h"
#include "Game/control/lot.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/animation.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/people.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
enum MPGUN_STATES
{

17
TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp
View file

@ -1,15 +1,16 @@
#include "framework.h"
#include "tr3_mpstick.h"
#include "Objects/TR3/Entity/tr3_mpstick.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "people.h"
#include "Game/items.h"
#include "Specific/setup.h"
#include "Game/control/lot.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Game/people.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO mpstickBite1 = { 247, 10, 11, 13 };
BITE_INFO mpstickBite2 = { 0, 0, 100, 6 };

15
TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h"
#include "tr3_raptor.h"
#include "Objects/TR3/Entity/tr3_raptor.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Specific/setup.h"
#include "Game/control/lot.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Game/control/lot.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
static BITE_INFO raptorBite = { 0, 66, 318, 22 };

11
TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h"
#include "tr3_scuba.h"
#include "Objects/TR3/Entity/tr3_scuba.h"
#include "Game/items.h"
#include "Game/control/box.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Game/control/los.h"
#include "Game/effects/effects.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO scubaGun = { 17, 164, 44, 18 };

11
TR5Main/Objects/TR3/Entity/tr3_shiva.cpp
View file

@ -1,14 +1,15 @@
#include "framework.h"
#include "tr3_shiva.h"
#include "Objects/TR3/Entity/tr3_shiva.h"
#include "Game/animation.h"
#include "Game/effects/effects.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO shivaLeftBite = { 0, 0, 920, 13 };
BITE_INFO shivaRightBite = { 0, 0, 920, 22 };

13
TR5Main/Objects/TR3/Entity/tr3_sophia.cpp
View file

@ -1,12 +1,13 @@
#include "framework.h"
#include "tr3_sophia.h"
#include "Game/items.h"
#include "Game/effects/effects.h"
#include "Game/control/lot.h"
#include "boss.h"
#include "Objects/TR3/Entity/tr3_sophia.h"
#include "Game/animation.h"
#include "Specific/level.h"
#include "Game/control/lot.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Objects/TR3/boss.h"
#include "Sound/sound.h"
#include "Specific/level.h"
static BOSS_STRUCT BossData;

14
TR5Main/Objects/TR3/Entity/tr3_tiger.cpp
View file

@ -1,14 +1,14 @@
#include "framework.h"
#include "tr3_tiger.h"
#include "Objects/TR3/Entity/tr3_tiger.h"
#include "Game/control/box.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"
#include "Game/Lara/lara.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
BITE_INFO tigerBite = { 19, -13, 3, 26 };

23
TR5Main/Objects/TR3/Entity/tr3_tony.cpp
View file

@ -1,18 +1,19 @@
#include "framework.h"
#include "tr3_tony.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/control/lot.h"
#include "boss.h"
#include "Game/control/box.h"
#include "Objects/TR3/Entity/tr3_tony.h"
#include "Game/animation.h"
#include "Game/collision/collide_item.h"
#include "Game/control/lot.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/effects/lara_fx.h"
#include "Game/Lara/lara.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Objects/TR3/boss.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Game/itemdata/creature_info.h"
#include "Game/collision/collide_item.h"
#include "Game/effects/lara_fx.h"
using namespace TEN::Effects::Lara;

15
TR5Main/Objects/TR3/Entity/tr3_trex.cpp
View file

@ -1,13 +1,14 @@
#include "framework.h"
#include "tr3_trex.h"
#include "Game/items.h"
#include "Game/control/box.h"
#include "Objects/TR3/Entity/tr3_trex.h"
#include "Game/camera.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/box.h"
#include "Game/control/control.h"
#include "Game/items.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Specific/level.h"
#include "Specific/setup.h"
void LaraTyrannosaurDeath(ITEM_INFO* item)
{

17
TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp
View file

@ -1,17 +1,18 @@
#include "framework.h"
#include "tr3_tribesman.h"
#include "Objects/TR3/Entity/tr3_tribesman.h"
#include "Game/animation.h"
#include "Game/control/box.h"
#include "Game/collision/sphere.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/collision/sphere.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "people.h"
#include "Game/animation.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/Lara/lara.h"
#include "Game/people.h"
#include "Objects/Generic/Traps/dart_emitter.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
using namespace TEN::Entities::Traps;

22
TR5Main/Objects/TR3/Trap/train.cpp
View file

@ -1,17 +1,19 @@
#include "framework.h"
#include "Game/items.h"
#include "Game/collision/floordata.h"
#include "Game/control/control.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Game/effects/effects.h"
#include "Sound/sound.h"
#include "Objects/TR3/Trap/train.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/sphere.h"
#include "Game/Lara/lara.h"
#include "Game/control/control.h"
#include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h"
#include "Game/animation.h"
#include "Game/collision/floordata.h"
#include "Game/collision/sphere.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#define TRAIN_VEL 260
#define LARA_TRAIN_DEATH_ANIM 3;

19
TR5Main/Objects/TR3/Vehicles/biggun.cpp
View file

@ -1,20 +1,21 @@
#include "framework.h"
#include "Objects/TR3/Vehicles/biggun.h"
#include "Game/items.h"
#include "Specific/level.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h"
#include "Specific/input.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_flare.h"
#include "Sound/sound.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara_struct.h"
#include "Game/effects/tomb4fx.h"
#include "Game/animation.h"
#include "Specific/setup.h"
#include "Game/camera.h"
#include "Objects/TR3/Vehicles/biggun_info.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Specific/setup.h"
#define RECOIL_TIME 26
#define RECOIL_Z 25

3
TR5Main/Objects/TR3/Vehicles/biggun_info.h
View file

@ -1,6 +1,7 @@
#pragma once
struct BIGGUNINFO {
struct BIGGUNINFO
{
short xRot;
short yRot;
short startYRot;

15
TR5Main/Objects/TR3/Vehicles/kayak.cpp
View file

@ -1,18 +1,19 @@
#include "framework.h"
#include "Objects/TR3/Vehicles/kayak.h"
#include "Game/effects/effects.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/Lara/lara.h"
#include "Game/collision/collide_item.h"
#include "Game/collision/collide_room.h"
#include "Game/Lara/lara_flare.h"
#include "Game/items.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/input.h"
#include "Game/control/control.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_flare.h"
#include "Objects/TR3/Vehicles/kayak_info.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Specific/setup.h"
using std::vector;

4
TR5Main/Objects/TR3/Vehicles/kayak_info.h
View file

@ -1,6 +1,8 @@
#pragma once
#include "Specific/phd_global.h"
struct KAYAK_INFO {
struct KAYAK_INFO
{
int Vel;
int Rot;
int FallSpeedF;

19
TR5Main/Objects/TR3/Vehicles/minecart.cpp
View file

@ -1,18 +1,19 @@
#include "framework.h"
#include "Objects/TR3/Vehicles/minecart.h"
#include "Game/Lara/lara.h"
#include "Game/collision/collide_item.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara_flare.h"
#include "Game/items.h"
#include "Game/collision/sphere.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/sphere.h"
#include "Game/collision/collide_item.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_flare.h"
#include "Objects/TR3/Vehicles/minecart_info.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#include "Specific/input.h"
#include "Sound/sound.h"
#include "Objects/TR3/Vehicles/minecart_info.h"
using std::vector;

2
TR5Main/Objects/TR3/Vehicles/minecart.h
View file

@ -2,8 +2,6 @@
#include "Game/items.h"
#include "Game/collision/collide_room.h"
void InitialiseMineCart(short itemNum);
void MineCartCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll);
int MineCartControl(void);

4
TR5Main/Objects/TR3/Vehicles/minecart_info.h
View file

@ -1,5 +1,7 @@
#pragma once
struct CART_INFO {
struct CART_INFO
{
int Speed;
int MidPos;
int FrontPos;

17
TR5Main/Objects/TR3/Vehicles/quad.cpp
View file

@ -1,21 +1,22 @@
#include "framework.h"
#include "Objects/TR3/Vehicles/quad.h"
#include "Objects/TR3/Vehicles/quad_info.h"
#include "Game/Lara/lara.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Game/collision/collide_room.h"
#include "Game/collision/collide_item.h"
#include "Game/camera.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/misc.h"
#include "Specific/setup.h"
#include "Objects/TR3/Vehicles/quad_info.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Game/animation.h"
#include "Sound/sound.h"
#include "Specific/setup.h"
#include "Specific/prng.h"
using std::vector;

3
TR5Main/Objects/TR3/Vehicles/quad_info.h
View file

@ -1,6 +1,7 @@
#pragma once
struct QUAD_INFO {
struct QUAD_INFO
{
int velocity;
short frontRot;
short rearRot;

21
TR5Main/Objects/TR3/Vehicles/rubberboat.cpp
View file

@ -1,17 +1,18 @@
#include "framework.h"
#include "rubberboat.h"
#include "Game/items.h"
#include "Specific/level.h"
#include "Game/collision/collide_item.h"
#include "Game/Lara/lara.h"
#include "Specific/input.h"
#include "Game/collision/sphere.h"
#include "Sound/sound.h"
#include "Game/effects/bubble.h"
#include "Objects/TR3/Vehicles/rubberboat.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Specific/setup.h"
#include "Game/collision/collide_item.h"
#include "Game/collision/sphere.h"
#include "Game/effects/bubble.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Objects/TR3/Vehicles/rubberboat_info.h"
#include "Sound/sound.h"
#include "Specific/input.h"
#include "Specific/level.h"
#include "Specific/setup.h"
#define RBOAT_SLIP 10
#define RBOAT_SIDE_SLIP 30

2
TR5Main/Objects/TR3/Vehicles/rubberboat.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "items.h"
#include "Game/items.h"
#include "Game/collision/collide_room.h"
void InitialiseRubberBoat(short itemNum);

27
TR5Main/Objects/TR3/Vehicles/upv.cpp
View file

@ -1,23 +1,24 @@
#include "framework.h"
#include "Objects/TR3/Vehicles/upv.h"
#include "Game/Lara/lara.h"
#include "Game/items.h"
#include "Game/collision/sphere.h"
#include "Game/effects/effects.h"
#include "Game/collision/collide_item.h"
#include "Game/control/box.h"
#include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/animation.h"
#include "Game/camera.h"
#include "Specific/setup.h"
#include "Game/collision/sphere.h"
#include "Game/collision/collide_item.h"
#include "Game/control/box.h"
#include "Game/control/los.h"
#include "Game/effects/bubble.h"
#include "Game/effects/effects.h"
#include "Game/items.h"
#include "Game/Lara/lara.h"
#include "Game/Lara/lara_flare.h"
#include "Game/Lara/lara_one_gun.h"
#include "Game/savegame.h"
#include "Objects/TR3/Vehicles/upv_info.h"
#include "Sound/sound.h"
#include "Specific/level.h"
#include "Specific/input.h"
#include "Game/savegame.h"
#include "Sound/sound.h"
#include "Objects/TR3/Vehicles/upv_info.h"
#include "Game/control/los.h"
#include "Specific/setup.h"
#define UPV_CONTROL 1
#define UPV_SURFACE 2

44
TR5Main/Objects/TR3/tr3_objects.cpp
View file

@ -1,40 +1,38 @@
#include "framework.h"
#include "Objects/TR3/tr3_objects.h"
/// entities
#include "tr3_civvy.h" // OK
#include "tr3_cobra.h" // OK
#include "tr3_fishemitter.h" // OK
#include "tr3_flamethrower.h" // OK
#include "tr3_monkey.h" // OK
#include "tr3_mpgun.h" // OK
#include "tr3_mpstick.h" // OK
#include "tr3_raptor.h" // OK
#include "tr3_scuba.h" // OK
#include "tr3_shiva.h" // OK
#include "tr3_sophia.h" // OK
#include "tr3_tiger.h" // OK
#include "tr3_tony.h" // OK
#include "tr3_trex.h" // OK
#include "tr3_tribesman.h" // OK
/// objects
#include "Objects/TR3/Entity/tr3_civvy.h" // OK
#include "Objects/TR3/Entity/tr3_cobra.h" // OK
#include "Objects/TR3/Entity/tr3_fishemitter.h" // OK
#include "Objects/TR3/Entity/tr3_flamethrower.h" // OK
#include "Objects/TR3/Entity/tr3_monkey.h" // OK
#include "Objects/TR3/Entity/tr3_mpgun.h" // OK
#include "Objects/TR3/Entity/tr3_mpstick.h" // OK
#include "Objects/TR3/Entity/tr3_raptor.h" // OK
#include "Objects/TR3/Entity/tr3_scuba.h" // OK
#include "Objects/TR3/Entity/tr3_shiva.h" // OK
#include "Objects/TR3/Entity/tr3_sophia.h" // OK
#include "Objects/TR3/Entity/tr3_tiger.h" // OK
#include "Objects/TR3/Entity/tr3_tony.h" // OK
#include "Objects/TR3/Entity/tr3_trex.h" // OK
#include "Objects/TR3/Entity/tr3_tribesman.h" // OK
/// traps
#include "train.h"
/// switch
#include "Objects/TR3/Trap/train.h"
/// vehicles
#include "Objects/TR3/Vehicles/biggun.h"
#include "Objects/TR3/Vehicles/kayak.h"
#include "Objects/TR3/Vehicles/minecart.h"
#include "Objects/TR3/Vehicles/quad.h"
#include "Objects/TR3/Vehicles/upv.h"
#include "rubberboat.h"
#include "Objects/TR3/Vehicles/rubberboat.h"
/// necessary import
#include "Game/control/box.h"
#include "Game/collision/collide_item.h"
#include "Game/itemdata/creature_info.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/itemdata/creature_info.h"
#include "Game/control/box.h"
static void StartBaddy(OBJECT_INFO* obj)
{
obj = &Objects[ID_TONY_BOSS];

2
TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp
View file

@ -10,7 +10,7 @@
#include "Specific/level.h"
#include "Game/misc.h"
#include "Game/Lara/lara.h"
#include "people.h"
#include "Game/people.h"
#include "Game/items.h"
#include "Game/control/lot.h"
#include "Game/itemdata/creature_info.h"

2
TR5Main/Objects/TR4/Entity/tr4_baddy.cpp
View file

@ -4,7 +4,7 @@
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "people.h"
#include "Game/people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/control/control.h"

2
TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
View file

@ -7,7 +7,7 @@
#include "Game/control/control.h"
#include "Specific/trmath.h"
#include "Game/Lara/lara.h"
#include "people.h"
#include "Game/people.h"
#include "Game/itemdata/creature_info.h"
namespace TEN::Entities::TR4

2
TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp
View file

@ -2,7 +2,7 @@
#include "tr4_crocodile.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "people.h"
#include "Game/people.h"
#include "Game/items.h"
#include "Specific/setup.h"
#include "Specific/level.h"

2
TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
View file

@ -2,7 +2,7 @@
#include "tr4_demigod.h"
#include "Game/items.h"
#include "Game/control/box.h"
#include "people.h"
#include "Game/people.h"
#include "Game/effects/effects.h"
#include "Game/animation.h"
#include "Game/effects/tomb4fx.h"

2
TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
View file

@ -1,6 +1,6 @@
#include "framework.h"
#include "tr4_harpy.h"
#include "people.h"
#include "Game/people.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/items.h"

2
TR5Main/Objects/TR4/Entity/tr4_sas.cpp
View file

@ -2,7 +2,7 @@
#include "tr4_sas.h"
#include "Game/control/box.h"
#include "Game/items.h"
#include "people.h"
#include "Game/people.h"
#include "Game/Lara/lara.h"
#include "Specific/setup.h"
#include "Specific/level.h"

2
TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
View file

@ -7,7 +7,7 @@
#include "Specific/level.h"
#include "Game/control/lot.h"
#include "Game/effects/tomb4fx.h"
#include "people.h"
#include "Game/people.h"
#include "Sound/sound.h"
#include "Specific/trmath.h"
#include "Objects/objectslist.h"

2
TR5Main/Objects/TR4/Entity/tr4_setha.cpp
View file

@ -7,7 +7,7 @@
#include "Game/control/control.h"
#include "Specific/trmath.h"
#include "Game/Lara/lara.h"
#include "people.h"
#include "Game/people.h"
#include "Game/itemdata/creature_info.h"
#include "Game/animation.h"

2
TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp
View file

@ -2,7 +2,7 @@
#include "tr4_skeleton.h"
#include "Game/items.h"
#include "Game/control/box.h"
#include "people.h"
#include "Game/people.h"
#include "Game/effects/effects.h"
#include "Game/effects/debris.h"
#include "Game/control/lot.h"

2
TR5Main/Objects/TR4/Entity/tr4_troops.cpp
View file

@ -4,7 +4,7 @@
#include "Game/items.h"
#include "Game/effects/effects.h"
#include "Game/Lara/lara.h"
#include "people.h"
#include "Game/people.h"
#include "Specific/setup.h"
#include "Game/control/lot.h"
#include "Specific/level.h"

2
TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
View file

@ -9,7 +9,7 @@
#include "Sound/sound.h"
#include "Game/Lara/lara.h"
#include "Objects/Generic/Traps/traps.h"
#include "people.h"
#include "Game/people.h"
#include "Game/effects/tomb4fx.h"
#include "Objects/TR4/Entity/tr4_wraith_info.h"
#include "Game/effects/lara_fx.h"

2
TR5Main/Objects/TR5/Entity/tr5_chef.cpp
View file

@ -4,7 +4,7 @@
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "people.h"
#include "Game/people.h"
#include "Specific/setup.h"
#include "Specific/level.h"
#include "Game/Lara/lara.h"

2
TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp
View file

@ -3,7 +3,7 @@
#include "Game/items.h"
#include "Game/control/box.h"
#include "Game/effects/effects.h"
#include "people.h"
#include "Game/people.h"
#include "Game/animation.h"
#include "Game/effects/tomb4fx.h"
#include "Game/Lara/lara.h"

2
TR5Main/Objects/TR5/Entity/tr5_guard.cpp
View file

@ -2,7 +2,7 @@
#include "tr5_guard.h"
#include "Game/items.h"
#include "Game/control/box.h"
#include "people.h"
#include "Game/people.h"
#include "Game/effects/effects.h"
#include "Game/effects/tomb4fx.h"
#include "Game/control/los.h"

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