From c1fc33ab52fe853514a98bc09f759cb6aaa68f6b Mon Sep 17 00:00:00 2001 From: Lwmte Date: Sat, 11 Sep 2021 09:41:29 +0300 Subject: [PATCH] Fix regressions --- TR5Main/Game/Lara/lara_basic.cpp | 2 +- TR5Main/Game/control.cpp | 2 +- TR5Main/Game/control/trigger.cpp | 2 +- TR5Main/Game/flipeffect.cpp | 2 +- TR5Main/Game/health.cpp | 2 +- TR5Main/Game/memory/malloc.cpp | 17 ----------------- TR5Main/Game/newinv2.cpp | 2 +- TR5Main/Game/pickup/pickup.cpp | 2 +- TR5Main/Game/puzzles_keys.cpp | 2 +- TR5Main/Game/savegame.cpp | 2 +- TR5Main/Objects/Generic/Doors/double_doors.cpp | 2 +- TR5Main/Objects/Generic/Doors/generic_doors.cpp | 2 +- .../Generic/Doors/pushpull_kick_door.cpp | 2 +- TR5Main/Objects/Generic/Doors/sequence_door.cpp | 2 +- TR5Main/Objects/Generic/Doors/steel_door.cpp | 2 +- .../Objects/Generic/Doors/underwater_door.cpp | 2 +- .../Objects/Generic/Switches/crowbar_switch.cpp | 2 +- .../Objects/Generic/Switches/pulley_switch.cpp | 2 +- TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp | 2 +- TR5Main/Objects/TR4/tr4_objects.cpp | 2 +- TR5Main/Objects/TR5/tr5_objects.cpp | 2 +- TR5Main/Objects/Utils/object_helper.cpp | 2 +- TR5Main/Renderer/Renderer11.cpp | 2 +- TR5Main/Scripting/GameLogicScript.cpp | 2 +- TR5Main/Specific/level.cpp | 2 +- TR5Main/Specific/setup.cpp | 2 +- 26 files changed, 25 insertions(+), 42 deletions(-) delete mode 100644 TR5Main/Game/memory/malloc.cpp diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp index d48e89879..2f5025cbc 100644 --- a/TR5Main/Game/Lara/lara_basic.cpp +++ b/TR5Main/Game/Lara/lara_basic.cpp @@ -9,7 +9,7 @@ #include "health.h" #include "Sound\sound.h" #include "draw.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "collide.h" #include "item.h" #include "camera.h" diff --git a/TR5Main/Game/control.cpp b/TR5Main/Game/control.cpp index ff1ff2797..6915e651c 100644 --- a/TR5Main/Game/control.cpp +++ b/TR5Main/Game/control.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "collide.h" #include "control.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "puzzles_keys.h" #include "camera.h" #include "Lara.h" diff --git a/TR5Main/Game/control/trigger.cpp b/TR5Main/Game/control/trigger.cpp index 1fff4ef24..29e39c846 100644 --- a/TR5Main/Game/control/trigger.cpp +++ b/TR5Main/Game/control/trigger.cpp @@ -6,7 +6,7 @@ #include "box.h" #include "camera.h" #include "puzzles_keys.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "lot.h" #include "spotcam.h" #include "traps.h" diff --git a/TR5Main/Game/flipeffect.cpp b/TR5Main/Game/flipeffect.cpp index d808197f3..6dada73cc 100644 --- a/TR5Main/Game/flipeffect.cpp +++ b/TR5Main/Game/flipeffect.cpp @@ -14,7 +14,7 @@ #include "tr5_bats_emitter.h" #include "tr5_spider_emitter.h" #include "tr5_pushableblock.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "puzzles_keys.h" #include "lara_fire.h" #include "effects\effects.h" diff --git a/TR5Main/Game/health.cpp b/TR5Main/Game/health.cpp index 1e18ca638..131eed58f 100644 --- a/TR5Main/Game/health.cpp +++ b/TR5Main/Game/health.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "health.h" #include "draw.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "lara.h" #include "camera.h" #include "level.h" diff --git a/TR5Main/Game/memory/malloc.cpp b/TR5Main/Game/memory/malloc.cpp deleted file mode 100644 index 313e318cd..000000000 --- a/TR5Main/Game/memory/malloc.cpp +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/TR5Main/Game/newinv2.cpp b/TR5Main/Game/newinv2.cpp index 75e0ae3dc..8a733245e 100644 --- a/TR5Main/Game/newinv2.cpp +++ b/TR5Main/Game/newinv2.cpp @@ -16,7 +16,7 @@ #include "lara_two_guns.h" #include "level.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "Renderer11.h" using namespace TEN::Renderer; diff --git a/TR5Main/Game/pickup/pickup.cpp b/TR5Main/Game/pickup/pickup.cpp index 88588253b..37f4268e6 100644 --- a/TR5Main/Game/pickup/pickup.cpp +++ b/TR5Main/Game/pickup/pickup.cpp @@ -1,5 +1,5 @@ #include "framework.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "Specific\phd_global.h" #include "lara.h" #include "draw.h" diff --git a/TR5Main/Game/puzzles_keys.cpp b/TR5Main/Game/puzzles_keys.cpp index fae997f2b..dd9f2d856 100644 --- a/TR5Main/Game/puzzles_keys.cpp +++ b/TR5Main/Game/puzzles_keys.cpp @@ -8,7 +8,7 @@ #include "inventory.h" #endif #include "switch.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "draw.h" #include "control.h" #include "puzzles_keys.h" diff --git a/TR5Main/Game/savegame.cpp b/TR5Main/Game/savegame.cpp index 2aa54dcb8..1aa0d54fb 100644 --- a/TR5Main/Game/savegame.cpp +++ b/TR5Main/Game/savegame.cpp @@ -3,7 +3,7 @@ #include "Lara.h" #include "items.h" #include "box.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "lot.h" #include "switch.h" #include "spotcam.h" diff --git a/TR5Main/Objects/Generic/Doors/double_doors.cpp b/TR5Main/Objects/Generic/Doors/double_doors.cpp index e162bca6a..b8f9c277c 100644 --- a/TR5Main/Objects/Generic/Doors/double_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/double_doors.cpp @@ -7,7 +7,7 @@ #include "lot.h" #include "newinv2.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "sound.h" #include "draw.h" #include "sphere.h" diff --git a/TR5Main/Objects/Generic/Doors/generic_doors.cpp b/TR5Main/Objects/Generic/Doors/generic_doors.cpp index 3b7ab3374..e0c10d25f 100644 --- a/TR5Main/Objects/Generic/Doors/generic_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/generic_doors.cpp @@ -7,7 +7,7 @@ #include "lot.h" #include "newinv2.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "sound.h" #include "draw.h" #include "sphere.h" diff --git a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp index ee5c0d543..bd2d41a0f 100644 --- a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp +++ b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp @@ -7,7 +7,7 @@ #include "lot.h" #include "newinv2.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "sound.h" #include "draw.h" #include "sphere.h" diff --git a/TR5Main/Objects/Generic/Doors/sequence_door.cpp b/TR5Main/Objects/Generic/Doors/sequence_door.cpp index 57bacac12..b7badeee6 100644 --- a/TR5Main/Objects/Generic/Doors/sequence_door.cpp +++ b/TR5Main/Objects/Generic/Doors/sequence_door.cpp @@ -7,7 +7,7 @@ #include "lot.h" #include "newinv2.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "sound.h" #include "draw.h" #include "sphere.h" diff --git a/TR5Main/Objects/Generic/Doors/steel_door.cpp b/TR5Main/Objects/Generic/Doors/steel_door.cpp index d74014f88..0e6a48441 100644 --- a/TR5Main/Objects/Generic/Doors/steel_door.cpp +++ b/TR5Main/Objects/Generic/Doors/steel_door.cpp @@ -7,7 +7,7 @@ #include "lot.h" #include "newinv2.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "sound.h" #include "draw.h" #include "sphere.h" diff --git a/TR5Main/Objects/Generic/Doors/underwater_door.cpp b/TR5Main/Objects/Generic/Doors/underwater_door.cpp index c282217c8..55c606d4b 100644 --- a/TR5Main/Objects/Generic/Doors/underwater_door.cpp +++ b/TR5Main/Objects/Generic/Doors/underwater_door.cpp @@ -7,7 +7,7 @@ #include "lot.h" #include "newinv2.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "sound.h" #include "draw.h" #include "sphere.h" diff --git a/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp b/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp index 5e05ce010..0b1a45510 100644 --- a/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp @@ -6,7 +6,7 @@ #include "crowbar_switch.h" #include "newinv2.h" #include "Sound\sound.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "level.h" #include "collide.h" diff --git a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp index 4b29e173e..4855df297 100644 --- a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "generic_switch.h" #include "Sound\sound.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "level.h" #include "collide.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp index a0e1e45fd..569083dae 100644 --- a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp @@ -4,7 +4,7 @@ #include "input.h" #include "lara.h" #include "items.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "setup.h" #include "health.h" diff --git a/TR5Main/Objects/TR4/tr4_objects.cpp b/TR5Main/Objects/TR4/tr4_objects.cpp index 6f39da5af..41d38b4ba 100644 --- a/TR5Main/Objects/TR4/tr4_objects.cpp +++ b/TR5Main/Objects/TR4/tr4_objects.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr4_objects.h" -#include "pickup.h" +#include "pickup\pickup.h" /// entities #include "tr4_ahmet.h" // OK #include "tr4_baddy.h" // OK diff --git a/TR5Main/Objects/TR5/tr5_objects.cpp b/TR5Main/Objects/TR5/tr5_objects.cpp index 5c00512ac..cf883bd54 100644 --- a/TR5Main/Objects/TR5/tr5_objects.cpp +++ b/TR5Main/Objects/TR5/tr5_objects.cpp @@ -59,7 +59,7 @@ #include "lara_one_gun.h" #include "lara_flare.h" #include "lara_initialise.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "effects\flmtorch.h" #include "setup.h" #include "switch.h" diff --git a/TR5Main/Objects/Utils/object_helper.cpp b/TR5Main/Objects/Utils/object_helper.cpp index 9be864fcf..63123b970 100644 --- a/TR5Main/Objects/Utils/object_helper.cpp +++ b/TR5Main/Objects/Utils/object_helper.cpp @@ -2,7 +2,7 @@ #include "object_helper.h" #include "collide.h" #include "objects.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "puzzles_keys.h" #include "level.h" #include "tr5_smashobject.h" diff --git a/TR5Main/Renderer/Renderer11.cpp b/TR5Main/Renderer/Renderer11.cpp index 94dc0ce56..bb7a38df1 100644 --- a/TR5Main/Renderer/Renderer11.cpp +++ b/TR5Main/Renderer/Renderer11.cpp @@ -6,7 +6,7 @@ #include "configuration.h" #include "draw.h" #include "health.h" -#include "pickup.h" +#include "pickup\pickup.h" #ifndef NEW_INV #include "inventory.h" #endif diff --git a/TR5Main/Scripting/GameLogicScript.cpp b/TR5Main/Scripting/GameLogicScript.cpp index 90e221ba1..ef4fede63 100644 --- a/TR5Main/Scripting/GameLogicScript.cpp +++ b/TR5Main/Scripting/GameLogicScript.cpp @@ -11,7 +11,7 @@ #include "level.h" #include "effects\tomb4fx.h" #include "effects\effects.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "newinv2.h" #include "ObjectIDs.h" #include "camera.h" diff --git a/TR5Main/Specific/level.cpp b/TR5Main/Specific/level.cpp index adec495ab..39b39401c 100644 --- a/TR5Main/Specific/level.cpp +++ b/TR5Main/Specific/level.cpp @@ -8,7 +8,7 @@ #include "spotcam.h" #include "camera.h" #include "control.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "generic_doors.h" #include "box.h" #include "sound.h" diff --git a/TR5Main/Specific/setup.cpp b/TR5Main/Specific/setup.cpp index 9cc054171..b37519ffb 100644 --- a/TR5Main/Specific/setup.cpp +++ b/TR5Main/Specific/setup.cpp @@ -7,7 +7,7 @@ #include "switch.h" #include "missile.h" #include "control.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "camera.h" #include "lara_one_gun.h" #include "lara_flare.h"