Commit graph

50 commits

Author SHA1 Message Date
Nils
a1c19a4b75 Renamed "generalPtr" of LaraInfo to "interactedItem"
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
2021-09-05 11:20:51 +02:00
Lwmte
cccd7a048b Clarify function names
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02:00
Lwmte
8f990d5d5b Merge branch 'master' into legacy_trigger_refactor 2021-08-29 09:16:39 +03:00
MontyTRC89
09ed0381ac Cleaned ID_AHMET 2021-08-29 08:10:29 +02:00
Lwmte
1de60cfc1c Merge branch 'master' into legacy_trigger_refactor 2021-08-28 21:38:58 +03:00
Lwmte
0b86ca1f67 Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct 2021-08-28 10:29:48 +03:00
MontyTRC89
d3e6bfc7dd Refactored switches 2021-08-28 06:37:22 +02:00
Lwmte
7cfe471c26 Cleanup a bit more 2021-08-26 19:55:34 +03:00
Lwmte
932ccc40d1 Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
218e9f685a Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03:00
hispidence
a0257f5fb5 Cast to GAME_OBJECT_ID. 2021-07-10 17:46:45 +01:00
MontyTRC89
f81d8e439f Added FROM_DEGREES function; Added quantity param to PickedUpObject(); LUA scripting refactoring WIP; 2021-06-29 05:00:15 +02:00
Trxye
add1a9b35b fix compile 2021-06-10 11:36:34 -05:00
Trxye
b35b585cf4 InitialiseObelisk(); some of ObeliskControl() 2021-06-09 22:48:18 -05:00
wolfcheese
f119f7d836 Beetle's room number was not updating due to low height; added small adjustment to its GetFloor() 2021-06-08 16:04:43 -04:00
Trxye
6be9afd436 fix pickups 2021-05-30 13:18:39 -05:00
Trxye
9000585d89 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-28 21:45:09 -05:00
Trxye
71b97945d6 fix clockwork beetle going only north; 2021-05-28 21:44:43 -05:00
asasas9500
b8166324ec Fix extra move in Senet 2021-05-28 23:25:07 -03:00
asasas9500
4485415c67 Fix beetle 2021-05-28 17:48:21 -03:00
asasas9500
dc7f621bbb Fix beetle rotation 2021-05-28 17:17:00 -03:00
Trxye
5973a049b7 fix level select; fix pause menu audio bug; fix clockwork beetle hand pos; 2021-05-28 00:57:53 -05:00
Trxye
3952e8bdca fix ClockworkBeetleControl(); 2021-05-27 18:35:31 -05:00
Trxye
185756d549 correct UseClockworkBeetle(); 2021-05-27 16:15:16 -05:00
Trxye
8f74bad385 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 16:08:09 -05:00
Trxye
e5ffb1f70e decompile clockwork beetle; 2021-05-27 16:07:57 -05:00
MontyTRC89
99614caa27 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
asasas9500
f015feb0ae Improve Semerkhet strategy 2021-05-25 20:10:59 -03:00
Trxye
388227bf63 fix _0x0040FAE0(); 2021-05-25 12:56:35 -05:00
asasas9500
6392aa001b Fix Senet 2021-05-24 23:57:09 -03:00
asasas9500
40d7daaff6 Fix MakeMove() 2021-05-24 23:02:08 -03:00
asasas9500
b2cea0aa9d Fix line endings 2021-05-24 18:56:23 -03:00
Trxye
f94b778f00 SenetControl(); add senet things to tr4_objects.cpp 2021-05-24 16:04:13 -05:00
asasas9500
de9a749b3f Add InitialiseGamePiece() 2021-05-24 17:22:42 -03:00
Trxye
786f6d90d5 ControlGodHead(); 2021-05-24 14:14:04 -05:00
Trxye
59a17c9381 GameStixCollision(); 2021-05-24 13:48:29 -05:00
asasas9500
699fbe40b4 Add MakeMove() 2021-05-24 15:35:22 -03:00
Trxye
6cb1b21dfd trigger_item_in_room(); CheckSenetWinner(); 2021-05-23 23:02:35 -05:00
Trxye
27bd701963 _0x0040FAE0(); SenetPieceExplosionEffect(); 2021-05-23 22:23:10 -05:00
asasas9500
67a97ace45 Add InitialiseGameStix() and GameStixControl() 2021-05-23 23:47:37 -03:00
KrysB4k
8f6b428942 Removed duplicate function GetFloorAndTestTriggers, fix pushblock issues
GetFloorAndItemTriggers() was removed in favor of TestTriggersAtXYZ() from switch.cpp, which does the same. All calls to GetFloorAndItemTriggers were replaced with TestTriggersAtXYZ.

Pushables pulling bug was fixed in TestBlockPull(). PushableBlockControl() now calls ItemNewRoom() to signal change of room membership of pushable.
2020-12-19 23:02:55 +01:00
Woops
551bcd5ebe bitshifts be gone 2020-10-17 23:36:06 -05:00
Montagna Marco
b987e9bda8 First ID_VON_CROY implementation; Added friendly to ITEM_INFO; 2020-08-29 09:39:10 +02:00
Montagna Marco
f8c57f054d Decompiled ID_ELEMENT_PUZZLE 2020-08-21 10:56:03 +02:00
Montagna Marco
68cce809e2 Decompiled ID_MAPPER 2020-08-21 07:01:08 +02:00
Sebastian Zych
6a3700345e Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
Montagna Marco
014aa1baa7 Frames refactoring 2020-07-25 18:02:35 +02:00
Montagna Marco
18994dd59e Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
TokyoSU
ee59d27517 (Broken) Deleted Global Folder
- No more enums.h, constants.h, macro.h, etc...
- moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00