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

Fixed duplicated ITEM_INFO definition

Browse source
This commit is contained in:
Raildex 2021-09-24 07:53:42 +02:00
parent c310b904b4
commit 7b070e75ad
239 changed files with 240 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -12,7 +12,7 @@
#include "items.h" #include "items.h"
#include "setup.h" #include "setup.h"
#include "level.h" #include "level.h"
#include "item.h"
int NoCheatCounter; int NoCheatCounter;
void lara_as_swimcheat(ITEM_INFO* item, COLL_INFO* coll) void lara_as_swimcheat(ITEM_INFO* item, COLL_INFO* coll)

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

@ -7,7 +7,7 @@
#include "camera.h" #include "camera.h"
#include "level.h" #include "level.h"
#include "input.h" #include "input.h"
#include "item.h"
CLIMB_DIRECTION LeftIntRightExtTab[4] = CLIMB_DIRECTION LeftIntRightExtTab[4] =
{ {
CLIMB_DIRECTION::West, CLIMB_DIRECTION::North, CLIMB_DIRECTION::East, CLIMB_DIRECTION::South CLIMB_DIRECTION::West, CLIMB_DIRECTION::North, CLIMB_DIRECTION::East, CLIMB_DIRECTION::South

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

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

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

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

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

@ -20,7 +20,7 @@
#include "GameFlowScript.h" #include "GameFlowScript.h"
#include "lara_struct.h" #include "lara_struct.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
WEAPON_INFO Weapons[NUM_WEAPONS] = WEAPON_INFO Weapons[NUM_WEAPONS] =
{ {
/* No weapons */ /* No weapons */

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

@ -12,7 +12,7 @@
#include "effects\effects.h" #include "effects\effects.h"
#include "effects\chaffFX.h" #include "effects\chaffFX.h"
#include "Specific\prng.h" #include "Specific\prng.h"
#include "item.h"
constexpr std::array<float, 28> FlareFlickerTable = { 0.7590,0.9880,0.8790,0.920,0.8020,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.84642,0.7896,0.817634,0.923424,0.7589,0.81399,0.92834,0.9978,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.74642 }; constexpr std::array<float, 28> FlareFlickerTable = { 0.7590,0.9880,0.8790,0.920,0.8020,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.84642,0.7896,0.817634,0.923424,0.7589,0.81399,0.92834,0.9978,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.74642 };
constexpr DirectX::SimpleMath::Vector3 FlareMainColor = Vector3(1,0.52947, 0.3921); constexpr DirectX::SimpleMath::Vector3 FlareMainColor = Vector3(1,0.52947, 0.3921);
constexpr std::array<float, 28> FlareFlickerTableLow = { 0.7590,0.1880,0.0790,0.920,0.8020,0.07610,0.197878,0.38978,0.09983,0.00934763,0.8485,0.0762573,0.84642,0.7896,0.517634,0.0923424,0.7589,0.081399,0.92834,0.01978,0.17610,0.497878,0.8978,0.69983,0.934763,0.28485,0.1762573,0.374642 }; constexpr std::array<float, 28> FlareFlickerTableLow = { 0.7590,0.1880,0.0790,0.920,0.8020,0.07610,0.197878,0.38978,0.09983,0.00934763,0.8485,0.0762573,0.84642,0.7896,0.517634,0.0923424,0.7589,0.081399,0.92834,0.01978,0.17610,0.497878,0.8978,0.69983,0.934763,0.28485,0.1762573,0.374642 };

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

@ -6,7 +6,7 @@
#include "collide.h" #include "collide.h"
#include "camera.h" #include "camera.h"
#include "level.h" #include "level.h"
#include "item.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*/
/*normal hanging and shimmying*/ /*normal hanging and shimmying*/

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

@ -5,7 +5,7 @@
#include "items.h" #include "items.h"
#include "setup.h" #include "setup.h"
#include "level.h" #include "level.h"
#include "item.h"
void InitialiseLara(int restore) void InitialiseLara(int restore)
{ {
if (Lara.itemNumber == NO_ITEM) if (Lara.itemNumber == NO_ITEM)

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

@ -11,7 +11,7 @@
#include "camera.h" #include "camera.h"
#include "control/control.h" #include "control/control.h"
#include "level.h" #include "level.h"
#include "item.h"
using namespace TEN::Floordata; using namespace TEN::Floordata;
/*this file has all the related functions to monkeyswinging*/ /*this file has all the related functions to monkeyswinging*/

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

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

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

@ -27,7 +27,7 @@
#include "effects\bubble.h" #include "effects\bubble.h"
#include "generic_switch.h" #include "generic_switch.h"
#include "Game/effects/lara_burn.h" #include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire; using namespace TEN::Effects::Fire;
using namespace TEN::Entities::Switches; using namespace TEN::Entities::Switches;
using namespace TEN::Effects::Environment; using namespace TEN::Effects::Environment;

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

@ -7,7 +7,7 @@
#include "collide.h" #include "collide.h"
#include "camera.h" #include "camera.h"
#include "level.h" #include "level.h"
#include "item.h"
/*this file has all the related functions to sliding*/ /*this file has all the related functions to sliding*/
void lara_slide_slope(ITEM_INFO* item, COLL_INFO* coll) void lara_slide_slope(ITEM_INFO* item, COLL_INFO* coll)

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

@ -11,7 +11,7 @@
#include "lara_fire.h" #include "lara_fire.h"
#include "level.h" #include "level.h"
#include "input.h" #include "input.h"
#include "item.h"
bool EnableCrawlFlexWaterPullUp, EnableCrawlFlexSubmerged; bool EnableCrawlFlexWaterPullUp, EnableCrawlFlexSubmerged;
void lara_col_surftread(ITEM_INFO* item, COLL_INFO* coll) void lara_col_surftread(ITEM_INFO* item, COLL_INFO* coll)

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

@ -14,7 +14,7 @@
#include "input.h" #include "input.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "GameFlowScript.h" #include "GameFlowScript.h"
#include "item.h"
struct SUBSUIT_INFO struct SUBSUIT_INFO
{ {
short XRot; short XRot;

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

@ -8,7 +8,7 @@
#include "lara_collide.h" #include "lara_collide.h"
#include "control/control.h" #include "control/control.h"
#include "control\los.h" #include "control\los.h"
#include "item.h"
using namespace TEN::Floordata; using namespace TEN::Floordata;
static short LeftClimbTab[4] = // offset 0xA0638 static short LeftClimbTab[4] = // offset 0xA0638

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

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

2
TR5Main/Game/animation.cpp
View file

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

2
TR5Main/Game/camera.cpp
View file

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

2
TR5Main/Game/collide.cpp
View file

@ -14,7 +14,7 @@
#include "Specific\prng.h" #include "Specific\prng.h"
#include "room.h" #include "room.h"
#include "Renderer11.h" #include "Renderer11.h"
#include "item.h"
using std::vector; using std::vector;
using namespace TEN::Math::Random; using namespace TEN::Math::Random;
using namespace TEN::Floordata; using namespace TEN::Floordata;

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

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

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

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

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

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

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

@ -6,7 +6,7 @@
#include "lara.h" #include "lara.h"
#include "level.h" #include "level.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.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

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

@ -16,6 +16,7 @@
#include "Lara\lara_climb.h" #include "Lara\lara_climb.h"
#include "Objects\Generic\Switches\generic_switch.h" #include "Objects\Generic\Switches\generic_switch.h"
#include "Game/effects/lara_burn.h" #include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire; using namespace TEN::Effects::Fire;
using namespace TEN::Entities::Switches; using namespace TEN::Entities::Switches;

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

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

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

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

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

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

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

@ -10,7 +10,7 @@
#include "input.h" #include "input.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "Objects/Effects/flame_emitters.h" #include "Objects/Effects/flame_emitters.h"
#include "item.h"
using namespace TEN::Entities::Effects; using namespace TEN::Entities::Effects;
void TriggerTorchFlame(char fxObj, char node) void TriggerTorchFlame(char fxObj, char node)

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

@ -6,7 +6,7 @@
#include "effects\footprint.h" #include "effects\footprint.h"
#include "level.h" #include "level.h"
#include "items.h" #include "items.h"
#include "item.h"
namespace TEN { namespace TEN {
namespace Effects { namespace Effects {
namespace Footprints { namespace Footprints {

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

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

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

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

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

@ -9,7 +9,7 @@
#include "lara.h" #include "lara.h"
#include "Specific\prng.h" #include "Specific\prng.h"
#include "effects\weather.h" #include "effects\weather.h"
#include "item.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/tomb4fx.cpp
View file

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

2
TR5Main/Game/flipeffect.cpp
View file

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

2
TR5Main/Game/floordata.cpp
View file

@ -4,7 +4,7 @@
#include "room.h" #include "room.h"
#include "level.h" #include "level.h"
#include "setup.h" #include "setup.h"
#include "item.h"
using namespace TEN::Floordata; using namespace TEN::Floordata;
int FLOOR_INFO::SectorPlane(int x, int z) const int FLOOR_INFO::SectorPlane(int x, int z) const

1
TR5Main/Game/health.cpp
View file

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

2
TR5Main/Game/items.cpp
View file

@ -6,7 +6,7 @@
#include "control/control.h" #include "control/control.h"
#include "floordata.h" #include "floordata.h"
#include "effects/effects.h" #include "effects/effects.h"
#include "item.h"
using namespace TEN::Floordata; using namespace TEN::Floordata;
void ClearItem(short itemNum) void ClearItem(short itemNum)

48
TR5Main/Game/items.h
View file

@ -34,54 +34,6 @@ enum ItemFlags
IFLAG_ACTIVATION_MASK = 0x3E00 // bits 9-13 IFLAG_ACTIVATION_MASK = 0x3E00 // bits 9-13
}; };
struct ITEM_INFO
{
int floor;
uint32_t touchBits;
uint32_t meshBits;
GAME_OBJECT_ID objectNumber;
short currentAnimState;
short goalAnimState;
short requiredAnimState;
short animNumber;
short frameNumber;
short roomNumber;
ROOM_VECTOR location;
short nextItem;
short nextActive;
short speed;
short fallspeed;
short hitPoints;
int boxNumber;
short timer;
uint16_t flags; // ItemFlags enum
short shade;
short triggerFlags;
short carriedItem;
short afterDeath;
short firedWeapon;
short itemFlags[8];
ITEM_DATA data;
PHD_3DPOS pos;
bool active;
short status; // ItemStatus enum
bool gravityStatus;
bool hitStatus;
bool collidable;
bool lookedAt;
bool dynamicLight;
bool poisoned;
uint8_t aiBits; // AIObjectType enum
bool reallyActive;
bool inDrawRoom;
bool friendly;
uint32_t swapMeshFlags;
short drawRoom;
short TOSSPAD;
PHD_3DPOS startPos;
short locationAI;
std::string luaName;
};
// used by fx->shade ! // used by fx->shade !
#define RGB555(r, g, b) ((r << 7) & 0x7C00 | (g << 2) & 0x3E0 | (b >> 3) & 0x1F) #define RGB555(r, g, b) ((r << 7) & 0x7C00 | (g << 2) & 0x3E0 | (b >> 3) & 0x1F)

2
TR5Main/Game/misc.cpp
View file

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

1
TR5Main/Game/missile.cpp
View file

@ -9,6 +9,7 @@
#include "setup.h" #include "setup.h"
#include "lara.h" #include "lara.h"
#include "collide.h" #include "collide.h"
#include "item.h"
#define SHARD_DAMAGE 30 #define SHARD_DAMAGE 30
#define ROCKET_DAMAGE 100 #define ROCKET_DAMAGE 100
#define DIVER_HARPOON_DAMAGE 50 #define DIVER_HARPOON_DAMAGE 50

2
TR5Main/Game/newinv2.cpp
View file

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

2
TR5Main/Game/objects.cpp
View file

@ -15,7 +15,7 @@
#include "input.h" #include "input.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "collide.h" #include "collide.h"
#include "item.h"
OBJECT_TEXTURE* WaterfallTextures[6]; OBJECT_TEXTURE* WaterfallTextures[6];
float WaterfallY[6]; float WaterfallY[6];
int lastWaterfallY = 0; int lastWaterfallY = 0;

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

@ -4,6 +4,7 @@
#include "Specific\trmath.h" #include "Specific\trmath.h"
#include <Specific\setup.h> #include <Specific\setup.h>
#include "Specific\prng.h" #include "Specific\prng.h"
#include "item.h"
using namespace TEN::Math::Random; using namespace TEN::Math::Random;
namespace TEN::Effects{ namespace TEN::Effects{

2
TR5Main/Game/people.cpp
View file

@ -8,7 +8,7 @@
#include "lara.h" #include "lara.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.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)
{ {
CREATURE_INFO* creature = (CREATURE_INFO*)item->data; CREATURE_INFO* creature = (CREATURE_INFO*)item->data;

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

@ -28,7 +28,7 @@
#include "pickup/pickup_weapon.h" #include "pickup/pickup_weapon.h"
#include "pickup/pickup_consumable.h" #include "pickup/pickup_consumable.h"
#include "pickup/pickup_misc_items.h" #include "pickup/pickup_misc_items.h"
#include "item.h"
OBJECT_COLLISION_BOUNDS PickUpBounds = // offset 0xA1338 OBJECT_COLLISION_BOUNDS PickUpBounds = // offset 0xA1338
{ {
0xFF00, 0x0100, 0xFF38, 0x00C8, 0xFF00, 0x0100, 0xF8E4, 0x071C, 0x0000, 0x0000, 0xFF00, 0x0100, 0xFF38, 0x00C8, 0xFF00, 0x0100, 0xF8E4, 0x071C, 0x0000, 0x0000,

2
TR5Main/Game/puzzles_keys.cpp
View file

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

2
TR5Main/Game/room.cpp
View file

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

2
TR5Main/Game/rope.cpp
View file

@ -7,7 +7,7 @@
#include "control/control.h" #include "control/control.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "camera.h" #include "camera.h"
#include "item.h"
PENDULUM CurrentPendulum; PENDULUM CurrentPendulum;
PENDULUM AlternatePendulum; PENDULUM AlternatePendulum;
ROPE_STRUCT Ropes[12]; ROPE_STRUCT Ropes[12];

2
TR5Main/Game/savegame.cpp
View file

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

2
TR5Main/Game/sphere.cpp
View file

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

2
TR5Main/Game/spotcam.cpp
View file

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

2
TR5Main/Game/switch.cpp
View file

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

1
TR5Main/Game/traps.cpp
View file

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

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

@ -13,7 +13,7 @@
#include <Specific/setup.h> #include <Specific/setup.h>
#include <Game/effects/lightning.h> #include <Game/effects/lightning.h>
#include "Game/effects/lara_burn.h" #include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire; using namespace TEN::Effects::Fire;
using namespace TEN::Effects::Lightning; using namespace TEN::Effects::Lightning;
using namespace TEN::Effects::Environment; using namespace TEN::Effects::Environment;

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

@ -12,7 +12,7 @@
#include "tr4_mutant.h" #include "tr4_mutant.h"
#include "collide.h" #include "collide.h"
#include "Game/effects/lara_burn.h" #include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire; using namespace TEN::Effects::Fire;
namespace TEN::entities::all namespace TEN::entities::all

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

@ -8,7 +8,7 @@
#include "effects/tomb4fx.h" #include "effects/tomb4fx.h"
#include "collide.h" #include "collide.h"
#include "animation.h" #include "animation.h"
#include "item.h"
namespace TEN::Entities::TR4 namespace TEN::Entities::TR4
{ {
LOCUST_INFO Locusts[MAX_LOCUSTS]; LOCUST_INFO Locusts[MAX_LOCUSTS];

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

@ -11,7 +11,7 @@
#include "sphere.h" #include "sphere.h"
#include "traps.h" #include "traps.h"
#include "Game/effects/lara_burn.h" #include "Game/effects/lara_burn.h"
#include "item.h"
using namespace TEN::Effects::Fire; using namespace TEN::Effects::Fire;
void TriggerElectricityWiresSparks(int x, int z, byte objNum, byte node, int flags) void TriggerElectricityWiresSparks(int x, int z, byte objNum, byte node, int flags)

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

@ -17,7 +17,7 @@
#include "misc.h" #include "misc.h"
#include "double_doors.h" #include "double_doors.h"
#include "collide.h" #include "collide.h"
#include "item.h"
namespace TEN::Entities::Doors namespace TEN::Entities::Doors
{ {
PHD_VECTOR DoubleDoorPos(0, 0, 220); PHD_VECTOR DoubleDoorPos(0, 0, 220);

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

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

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

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

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

@ -17,7 +17,7 @@
#include "misc.h" #include "misc.h"
#include "steel_door.h" #include "steel_door.h"
#include "collide.h" #include "collide.h"
#include "item.h"
namespace TEN::Entities::Doors namespace TEN::Entities::Doors
{ {
void InitialiseSteelDoor(short itemNumber) void InitialiseSteelDoor(short itemNumber)

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

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

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

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

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

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

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

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

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

@ -9,7 +9,7 @@
#include "level.h" #include "level.h"
#include "collide.h" #include "collide.h"
#include "animation.h" #include "animation.h"
#include "item.h"
namespace TEN::Entities::Switches namespace TEN::Entities::Switches
{ {
PHD_VECTOR CrowbarPos = { -89, 0, -328 }; PHD_VECTOR CrowbarPos = { -89, 0, -328 };

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

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

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

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

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

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

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

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

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

@ -6,7 +6,7 @@
#include "level.h" #include "level.h"
#include "collide.h" #include "collide.h"
#include "animation.h" #include "animation.h"
#include "item.h"
namespace TEN::Entities::Switches namespace TEN::Entities::Switches
{ {
PHD_VECTOR RailSwitchPos = { 0, 0, -550 }; PHD_VECTOR RailSwitchPos = { 0, 0, -550 };

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

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

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

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

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

@ -5,7 +5,7 @@
#include "effects\effects.h" #include "effects\effects.h"
#include "items.h" #include "items.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "item.h"
namespace TEN::Entities::Traps namespace TEN::Entities::Traps
{ {
void DartControl(short itemNumber) void DartControl(short itemNumber)

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

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

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

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

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

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

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

@ -7,7 +7,7 @@
#include "lara.h" #include "lara.h"
#include "control/control.h" #include "control/control.h"
#include "animation.h" #include "animation.h"
#include "item.h"
// TODO: Evil lara is not targetable and cant move like lara. // TODO: Evil lara is not targetable and cant move like lara.
// get weapon damage to damage lara instead. (*25) // get weapon damage to damage lara instead. (*25)

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

@ -10,7 +10,7 @@
#include "Sound/sound.h" #include "Sound/sound.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "animation.h" #include "animation.h"
#include "item.h"
enum abortion_anims { enum abortion_anims {
ABORT_EMPTY, ABORT_STOP, ABORT_TURNL, ABORT_TURNR, ABORT_ATTACK1, ABORT_ATTACK2, ABORT_EMPTY, ABORT_STOP, ABORT_TURNL, ABORT_TURNR, ABORT_ATTACK1, ABORT_ATTACK2,
ABORT_ATTACK3, ABORT_FORWARD, ABORT_SET, ABORT_FALL, ABORT_DEATH, ABORT_KILL ABORT_ATTACK3, ABORT_FORWARD, ABORT_SET, ABORT_FALL, ABORT_DEATH, ABORT_KILL

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

@ -9,7 +9,7 @@
#include "effects\effects.h" #include "effects\effects.h"
#include "Specific\trmath.h" #include "Specific\trmath.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
#define NATLA_NEAR_DEATH 200 #define NATLA_NEAR_DEATH 200
enum natla_anims { enum natla_anims {

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

@ -9,6 +9,7 @@
#include "level.h" #include "level.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "control/control.h" #include "control/control.h"
#include "item.h"
BITE_INFO wolfBite = { 0, -14, 174, 6 }; BITE_INFO wolfBite = { 0, -14, 174, 6 };
enum wolfStates { enum wolfStates {

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

@ -6,6 +6,7 @@
#include "setup.h" #include "setup.h"
#include "level.h" #include "level.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO barracudaBite = { 2, -60, 121, 7 }; BITE_INFO barracudaBite = { 2, -60, 121, 7 };
void BarracudaControl(short itemNum) void BarracudaControl(short itemNum)

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

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

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

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

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

@ -7,7 +7,7 @@
#include "setup.h" #include "setup.h"
#include "level.h" #include "level.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO eagleBite = { 15, 46, 21, 6 }; BITE_INFO eagleBite = { 15, 46, 21, 6 };
BITE_INFO crowBite = { 2, 10, 60, 14 }; BITE_INFO crowBite = { 2, 10, 60, 14 };

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

@ -11,7 +11,7 @@
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "floordata.h" #include "floordata.h"
#include "collide.h" #include "collide.h"
#include "item.h"
BITE_INFO knifeLeft = { 0, 0, 0, 5 }; BITE_INFO knifeLeft = { 0, 0, 0, 5 };
BITE_INFO knifeRight = { 0, 0, 0, 8 }; BITE_INFO knifeRight = { 0, 0, 0, 8 };

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

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

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

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

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

@ -8,7 +8,7 @@
#include "level.h" #include "level.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "control/control.h" #include "control/control.h"
#include "item.h"
BITE_INFO ratBite = { 0, 0, 57, 2 }; BITE_INFO ratBite = { 0, 0, 57, 2 };
void RatControl(short itemNum) void RatControl(short itemNum)

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

@ -7,7 +7,7 @@
#include "level.h" #include "level.h"
#include "control/control.h" #include "control/control.h"
#include "animation.h" #include "animation.h"
#include "item.h"
BITE_INFO sharkBite = { 17, -22, 344, 12 }; BITE_INFO sharkBite = { 17, -22, 344, 12 };
void SharkControl(short itemNum) void SharkControl(short itemNum)

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

@ -6,6 +6,7 @@
#include "level.h" #include "level.h"
#include "control/control.h" #include "control/control.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO silencerGun = { 3, 331, 56, 10 }; BITE_INFO silencerGun = { 3, 331, 56, 10 };
void SilencerControl(short itemNum) void SilencerControl(short itemNum)

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

@ -14,7 +14,7 @@
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "skidoo_info.h" #include "skidoo_info.h"
#include "animation.h" #include "animation.h"
#include "item.h"
enum SKIDMAN_STATE { SMAN_EMPTY, SMAN_WAIT, SMAN_MOVING, SMAN_STARTLEFT, SMAN_STARTRIGHT, SMAN_LEFT, SMAN_RIGHT, SMAN_DEATH }; 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_spear_guardian.cpp
View file

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

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

@ -11,7 +11,7 @@
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "control/control.h" #include "control/control.h"
#include "animation.h" #include "animation.h"
#include "item.h"
BITE_INFO spiderBite = { 0, 0, 41, 1 }; BITE_INFO spiderBite = { 0, 0, 41, 1 };
static void S_SpiderBite(ITEM_INFO* item) static void S_SpiderBite(ITEM_INFO* item)

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

@ -10,7 +10,7 @@
#include "lara.h" #include "lara.h"
#include "Sound/sound.h" #include "Sound/sound.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO swordBite = { 0, 37, 550, 15 }; BITE_INFO swordBite = { 0, 37, 550, 15 };
void InitialiseSwordGuardian(short itemNum) void InitialiseSwordGuardian(short itemNum)

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

@ -6,7 +6,7 @@
#include "level.h" #include "level.h"
#include "lara.h" #include "lara.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO workerDualGunL = { -2, 275, 23, 6 }; BITE_INFO workerDualGunL = { -2, 275, 23, 6 };
BITE_INFO workerDualGunR = { 2, 275, 23, 10 }; BITE_INFO workerDualGunR = { 2, 275, 23, 10 };

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

@ -13,7 +13,7 @@
#include "effects/effects.h" #include "effects/effects.h"
#include "Specific/trmath.h" #include "Specific/trmath.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO workerFlameThrower = { 0, 250, 32, 9 }; BITE_INFO workerFlameThrower = { 0, 250, 32, 9 };
static void Flame(DWORD x, int y, DWORD z, int speed, WORD yrot, WORD roomNumber) static void Flame(DWORD x, int y, DWORD z, int speed, WORD yrot, WORD roomNumber)

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

@ -8,7 +8,7 @@
#include "level.h" #include "level.h"
#include "control/control.h" #include "control/control.h"
#include "itemdata/creature_info.h" #include "itemdata/creature_info.h"
#include "item.h"
BITE_INFO workerMachineGun = { 0, 308, 32, 9 }; BITE_INFO workerMachineGun = { 0, 308, 32, 9 };
void InitialiseWorkerMachineGun(short itemNum) void InitialiseWorkerMachineGun(short itemNum)

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