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

Fix regressions

Browse source
This commit is contained in:
Lwmte 2021-09-11 09:41:29 +03:00
parent 59931be5a8
commit c1fc33ab52
26 changed files with 25 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@
#include "health.h" #include "health.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "draw.h" #include "draw.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "collide.h" #include "collide.h"
#include "item.h" #include "item.h"
#include "camera.h" #include "camera.h"

2
TR5Main/Game/control.cpp
View file

@ -1,7 +1,7 @@
#include "framework.h" #include "framework.h"
#include "collide.h" #include "collide.h"
#include "control.h" #include "control.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "puzzles_keys.h" #include "puzzles_keys.h"
#include "camera.h" #include "camera.h"
#include "Lara.h" #include "Lara.h"

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

@ -6,7 +6,7 @@
#include "box.h" #include "box.h"
#include "camera.h" #include "camera.h"
#include "puzzles_keys.h" #include "puzzles_keys.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "lot.h" #include "lot.h"
#include "spotcam.h" #include "spotcam.h"
#include "traps.h" #include "traps.h"

2
TR5Main/Game/flipeffect.cpp
View file

@ -14,7 +14,7 @@
#include "tr5_bats_emitter.h" #include "tr5_bats_emitter.h"
#include "tr5_spider_emitter.h" #include "tr5_spider_emitter.h"
#include "tr5_pushableblock.h" #include "tr5_pushableblock.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "puzzles_keys.h" #include "puzzles_keys.h"
#include "lara_fire.h" #include "lara_fire.h"
#include "effects\effects.h" #include "effects\effects.h"

2
TR5Main/Game/health.cpp
View file

@ -1,7 +1,7 @@
#include "framework.h" #include "framework.h"
#include "health.h" #include "health.h"
#include "draw.h" #include "draw.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "lara.h" #include "lara.h"
#include "camera.h" #include "camera.h"
#include "level.h" #include "level.h"

17
TR5Main/Game/memory/malloc.cpp
View file

@ -1,17 +0,0 @@
#include "framework.h"
#include "malloc.h"
char* malloc_buffer;
int malloc_size;
char* malloc_ptr;
int malloc_free;
int malloc_used;
void init_game_malloc() noexcept
{
}
void game_free(void* ptr) noexcept
{
delete[] ptr;
}

2
TR5Main/Game/newinv2.cpp
View file

@ -16,7 +16,7 @@
#include "lara_two_guns.h" #include "lara_two_guns.h"
#include "level.h" #include "level.h"
#include "input.h" #include "input.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "Renderer11.h" #include "Renderer11.h"
using namespace TEN::Renderer; using namespace TEN::Renderer;

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

@ -1,5 +1,5 @@
#include "framework.h" #include "framework.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "Specific\phd_global.h" #include "Specific\phd_global.h"
#include "lara.h" #include "lara.h"
#include "draw.h" #include "draw.h"

2
TR5Main/Game/puzzles_keys.cpp
View file

@ -8,7 +8,7 @@
#include "inventory.h" #include "inventory.h"
#endif #endif
#include "switch.h" #include "switch.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "draw.h" #include "draw.h"
#include "control.h" #include "control.h"
#include "puzzles_keys.h" #include "puzzles_keys.h"

2
TR5Main/Game/savegame.cpp
View file

@ -3,7 +3,7 @@
#include "Lara.h" #include "Lara.h"
#include "items.h" #include "items.h"
#include "box.h" #include "box.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "lot.h" #include "lot.h"
#include "switch.h" #include "switch.h"
#include "spotcam.h" #include "spotcam.h"

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

@ -7,7 +7,7 @@
#include "lot.h" #include "lot.h"
#include "newinv2.h" #include "newinv2.h"
#include "input.h" #include "input.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "sound.h" #include "sound.h"
#include "draw.h" #include "draw.h"
#include "sphere.h" #include "sphere.h"

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

@ -7,7 +7,7 @@
#include "lot.h" #include "lot.h"
#include "newinv2.h" #include "newinv2.h"
#include "input.h" #include "input.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "sound.h" #include "sound.h"
#include "draw.h" #include "draw.h"
#include "sphere.h" #include "sphere.h"

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

@ -7,7 +7,7 @@
#include "lot.h" #include "lot.h"
#include "newinv2.h" #include "newinv2.h"
#include "input.h" #include "input.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "sound.h" #include "sound.h"
#include "draw.h" #include "draw.h"
#include "sphere.h" #include "sphere.h"

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

@ -7,7 +7,7 @@
#include "lot.h" #include "lot.h"
#include "newinv2.h" #include "newinv2.h"
#include "input.h" #include "input.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "sound.h" #include "sound.h"
#include "draw.h" #include "draw.h"
#include "sphere.h" #include "sphere.h"

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

@ -7,7 +7,7 @@
#include "lot.h" #include "lot.h"
#include "newinv2.h" #include "newinv2.h"
#include "input.h" #include "input.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "sound.h" #include "sound.h"
#include "draw.h" #include "draw.h"
#include "sphere.h" #include "sphere.h"

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

@ -7,7 +7,7 @@
#include "lot.h" #include "lot.h"
#include "newinv2.h" #include "newinv2.h"
#include "input.h" #include "input.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "sound.h" #include "sound.h"
#include "draw.h" #include "draw.h"
#include "sphere.h" #include "sphere.h"

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

@ -6,7 +6,7 @@
#include "crowbar_switch.h" #include "crowbar_switch.h"
#include "newinv2.h" #include "newinv2.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "level.h" #include "level.h"
#include "collide.h" #include "collide.h"

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

@ -5,7 +5,7 @@
#include "lara.h" #include "lara.h"
#include "generic_switch.h" #include "generic_switch.h"
#include "Sound\sound.h" #include "Sound\sound.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "level.h" #include "level.h"
#include "collide.h" #include "collide.h"

2
TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp
View file

@ -4,7 +4,7 @@
#include "input.h" #include "input.h"
#include "lara.h" #include "lara.h"
#include "items.h" #include "items.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "setup.h" #include "setup.h"
#include "health.h" #include "health.h"

2
TR5Main/Objects/TR4/tr4_objects.cpp
View file

@ -1,6 +1,6 @@
#include "framework.h" #include "framework.h"
#include "tr4_objects.h" #include "tr4_objects.h"
#include "pickup.h" #include "pickup\pickup.h"
/// entities /// entities
#include "tr4_ahmet.h" // OK #include "tr4_ahmet.h" // OK
#include "tr4_baddy.h" // OK #include "tr4_baddy.h" // OK

2
TR5Main/Objects/TR5/tr5_objects.cpp
View file

@ -59,7 +59,7 @@
#include "lara_one_gun.h" #include "lara_one_gun.h"
#include "lara_flare.h" #include "lara_flare.h"
#include "lara_initialise.h" #include "lara_initialise.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "effects\flmtorch.h" #include "effects\flmtorch.h"
#include "setup.h" #include "setup.h"
#include "switch.h" #include "switch.h"

2
TR5Main/Objects/Utils/object_helper.cpp
View file

@ -2,7 +2,7 @@
#include "object_helper.h" #include "object_helper.h"
#include "collide.h" #include "collide.h"
#include "objects.h" #include "objects.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "puzzles_keys.h" #include "puzzles_keys.h"
#include "level.h" #include "level.h"
#include "tr5_smashobject.h" #include "tr5_smashobject.h"

2
TR5Main/Renderer/Renderer11.cpp
View file

@ -6,7 +6,7 @@
#include "configuration.h" #include "configuration.h"
#include "draw.h" #include "draw.h"
#include "health.h" #include "health.h"
#include "pickup.h" #include "pickup\pickup.h"
#ifndef NEW_INV #ifndef NEW_INV
#include "inventory.h" #include "inventory.h"
#endif #endif

2
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -11,7 +11,7 @@
#include "level.h" #include "level.h"
#include "effects\tomb4fx.h" #include "effects\tomb4fx.h"
#include "effects\effects.h" #include "effects\effects.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "newinv2.h" #include "newinv2.h"
#include "ObjectIDs.h" #include "ObjectIDs.h"
#include "camera.h" #include "camera.h"

2
TR5Main/Specific/level.cpp
View file

@ -8,7 +8,7 @@
#include "spotcam.h" #include "spotcam.h"
#include "camera.h" #include "camera.h"
#include "control.h" #include "control.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "generic_doors.h" #include "generic_doors.h"
#include "box.h" #include "box.h"
#include "sound.h" #include "sound.h"

2
TR5Main/Specific/setup.cpp
View file

@ -7,7 +7,7 @@
#include "switch.h" #include "switch.h"
#include "missile.h" #include "missile.h"
#include "control.h" #include "control.h"
#include "pickup.h" #include "pickup\pickup.h"
#include "camera.h" #include "camera.h"
#include "lara_one_gun.h" #include "lara_one_gun.h"
#include "lara_flare.h" #include "lara_flare.h"