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

Fix merge conflicts

Browse source
This commit is contained in:
Lwmte 2021-09-09 11:25:03 +03:00
parent 48a9a1d52a
commit c81fcfe43e
7 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TR5Main/Game/collide.cpp
View file

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

1
TR5Main/Game/items.cpp
View file

@ -5,6 +5,7 @@
#include "lara.h"
#include "control.h"
#include "effects\effects.h"
#include "Game\box.h"
void ClearItem(short itemNum)
{

2
TR5Main/Game/items.h
View file

@ -3,8 +3,6 @@
#include "item.h"
#include <vector>
enum GAME_OBJECT_ID : short;
enum AIObjectType
{
NO_AI = 0x0000,

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

@ -5,6 +5,7 @@
#include "lara.h"
#include "fish.h"
#include "control.h"
#include "effects\effects.h"
#define PIRAHNA_DAMAGE 4
#define X 0

1
TR5Main/Objects/TR4/Entity/tr4_baboon.cpp
View file

@ -6,6 +6,7 @@
#include "control.h"
#include "misc.h"
#include "Lara.h"
#include "effects\effects.h"
#include "effects\tomb4fx.h"
#include "creature_info.h"

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

@ -13,6 +13,8 @@
#include "creature_info.h"
#include "setup.h"
#include "control/trigger.h"
#include "effects/effects.h"
#include "effects/tomb4fx.h"
ITEM_INFO jeepDummyTarget;

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

@ -11,7 +11,6 @@
#include <sphere.h>
#include <people.h>
#include "creature_info.h"
#include "effect2.h"
BITE_INFO SethaBite1 = { 0,220,50,17 };
BITE_INFO SethaBite2 = { 0,220,50,13 };