Lwmte
a8e128bc0b
Rename some legacy fields, restore footsteps
2021-09-13 02:07:42 +03:00
Lwmte
280c9fa28b
Merge branch 'master' into coll_info_reorganize
2021-09-10 10:11:15 +03:00
Lwmte
c9d4914e3d
Simplify COLL_POSITION
2021-09-10 00:43:26 +03:00
Lwmte
48a9a1d52a
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
ba6c260b92
Further code organizing
2021-09-08 18:19:06 +03:00
Raildex
2ee57e5891
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
Raildex
dce3f72d99
Removed BaddieSlots
...
ActiveCreatures now contains pointers to CREATURE_INFOs of items instead
Every Item with Creature Info now contains their own path finding data.
Fixed OoB issues with XZ_GET_SECTOR
2021-09-03 09:37:42 +02:00
Raildex
b422cafc79
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/Lara/lara.cpp
# TR5Main/Game/Lara/lara_collide.cpp
# TR5Main/Game/Lara/lara_monkey.cpp
# TR5Main/Game/Lara/lara_struct.h
# TR5Main/Game/Lara/lara_tests.cpp
# TR5Main/Game/collide.h
# TR5Main/Game/control.h
# TR5Main/Game/effect.h
# TR5Main/Game/effect2.cpp
# TR5Main/Game/flipeffect.cpp
# TR5Main/Game/floordata.h
# TR5Main/Game/hair.cpp
# TR5Main/Game/health.cpp
# TR5Main/Game/items.cpp
# TR5Main/Game/newinv2.cpp
# TR5Main/Game/spotcam.cpp
# TR5Main/Objects/Effects/tr4_bubbles.cpp
# TR5Main/Objects/TR1/Entity/tr1_ape.cpp
# TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
# TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
# TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
# TR5Main/Objects/TR2/Entity/tr2_shark.cpp
# TR5Main/Objects/TR2/Entity/tr2_spider.cpp
# TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
# TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
# TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
# TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
# TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
# TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
# TR5Main/Objects/TR3/Entity/tr3_trex.cpp
# TR5Main/Objects/TR3/Vehicles/kayak.cpp
# TR5Main/Objects/TR3/Vehicles/minecart.cpp
# TR5Main/Objects/TR4/Entity/tr4_bat.cpp
# TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
# TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
# TR5Main/Objects/TR4/Entity/tr4_dog.cpp
# TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
# TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
# TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
# TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_troops.cpp
# TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
# TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
# TR5Main/Objects/TR4/Vehicles/motorbike.cpp
# TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
# TR5Main/Objects/TR5/Entity/tr5_imp.cpp
# TR5Main/Objects/TR5/Entity/tr5_larson.cpp
# TR5Main/Objects/TR5/Entity/tr5_lion.cpp
# TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
# TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
# TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
# TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
# TR5Main/Renderer/Renderer11Draw2D.cpp
# TR5Main/Specific/input.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj.filters
2021-08-31 18:20:23 +02:00
Lwmte
6d9cf3c214
Fix namespace case
2021-08-30 18:03:21 +03:00
Lwmte
21df1e84f1
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
2021-08-29 23:53:58 +03:00
Raildex
f7080f56c9
Integrated ITEM_DATA into ITEM_INFO
...
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
Lwmte
7d4fde9942
Cleanup a bit more
2021-08-26 19:55:34 +03:00
Lwmte
5ace1a4c34
Rename effect.cpp to flipeffect.cpp to avoid confusions
2021-08-26 16:24:43 +03:00
Lwmte
b2831172af
Make flipeffect names consistent
2021-08-26 16:11:04 +03:00
Lwmte
1f68fd812b
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
ec9479860f
Merge branch 'master' into legacy_trigger_refactor
2021-08-24 19:04:54 +03:00
Lwmte
70626854f0
Replace all remaining occurences of coll globals
2021-08-24 16:54:26 +03:00
MontyTRC89
0ed8181cda
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine ; Renamed namespaces;
...
# Conflicts:
# TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
wolfcheese
8da8973f19
Added checks to raising block, pushable block, floor and ceiling trapdoors to prevent crashing upon load
2021-06-15 19:48:30 -04:00
MontyTRC89
b2f102ae63
Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall;
2021-05-26 06:04:32 +02:00
KrysB4k
cf3b4a327e
Small fixes with TestBlockPull()
...
- fixed typo in case WEST (was zAddLara, should be xAddLara)
- rearranged floor height check for Lara
2021-02-05 14:21:24 +01:00
KrysB4k
81fcbc377e
Tiny fix
2021-02-04 02:01:29 +01:00
KrysB4k
04d6023abb
Fix remaining pushable bugs
...
- fix pushing pushblock from 1 click step
- fix pushing pushblock into non-floor pushable
- remove floor properties from pushblocks with height < 2
2021-02-04 01:19:14 +01:00
KrysB4k
4044552c94
Removed room check in PushableBlockCollision
...
Fixes issue with (standable) pushblocks not being interactable from another room
2021-02-01 19:12:22 +01:00
KrysB4k
9bee5d49ed
Adjust calls to AddBridge and RemoveBridge in pushables
2021-02-01 17:29:33 +01:00
asasas9500
bfd35bbfc4
Merge branch 'PushableOCB' of https://github.com/MontyTRC89/TR5Main into PushableOCB
2021-01-27 01:12:04 -03:00
asasas9500
4b480d8057
Reimplement virtual rooms into floordata
2021-01-27 01:04:31 -03:00
KrysB4k
6901faae3d
Fix pushing pushables into bridges
...
Swapped pushable_info function for a simple #define
2021-01-18 13:41:59 +01:00
KrysB4k
dfdc351fe3
Merge remaining features of VirtualRooms
2021-01-16 18:38:16 +01:00
asasas9500
7604d2e1c3
Merge branch 'VirtualRooms' into PushableOCB
2021-01-16 11:39:52 -03:00
asasas9500
818ca54f5c
Revert changes to pushable block
2021-01-16 11:27:27 -03:00
asasas9500
e74a72a084
Revert "Fix pushable collision bug"
...
This reverts commit 604eac4351
2021-01-16 11:05:14 -03:00
asasas9500
f6baa33489
Revert "Fixed comment"
...
This reverts commit 492d03d290
2021-01-16 11:04:50 -03:00
KrysB4k
492d03d290
Fixed comment
2021-01-12 20:17:38 +01:00
KrysB4k
604eac4351
Fix pushable collision bug
...
Remove bridge from pushable (stack) on movement start and add bridge from pushable (stack) on movement stop
2021-01-12 20:11:03 +01:00
asasas9500
2917bd9997
Implement virtual rooms into floordata
2021-01-06 17:53:13 -03:00
KrysB4k
19e6277232
New pushblock movement code
...
Bounding box data is used to move pushable. Removed old code with itemFlags, which fixes pushable bug with coordinates near 32768
2020-12-31 06:50:16 +01:00
KrysB4k
d0143c87b4
Updates to pushables
...
Introduced PUSHABLE_INFO struct, which is stored in item->data of pushable.
Tried to implement as many TRNG pushable OCBs as I could.
2020-12-30 02:12:14 +01:00
KrysB4k
e5e32251a8
Removed mistakes with previous commit
2020-12-25 01:36:28 +01:00
KrysB4k
7754e5c606
Revert "Pushables: Fix error in stack height code, use bbox Y1 value for non-rigid pushables"
...
This reverts commit 4327a78f85
2020-12-25 01:31:17 +01:00
KrysB4k
4327a78f85
Pushables: Fix error in stack height code, use bbox Y1 value for non-rigid pushables
...
Y1 value of pushable's bounding box is now used in computing block height
2020-12-25 01:30:24 +01:00
KrysB4k
5cee62e169
Proper collision for stacked pushables
...
Total height is calculated for pushable stacks and used for evaluation in TestBlockPush() and TestBlockPull()
2020-12-24 03:53:36 +01:00
asasas9500
10a3d9167a
Fix line endings
2020-12-21 13:16:29 -03:00
KrysB4k
d5f24ab752
Stackable pushables
2020-12-21 04:13:14 +01:00
KrysB4k
af647066f7
Pushables: parse CollidedItems array for objects with floor procedures
2020-12-20 19:31:07 +01:00
asasas9500
23a841a3da
Fix stacked bridges
2020-12-20 14:04:27 -03:00
KrysB4k
735e73f1ea
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
MontyTRC89
efd37b3290
Raising blocks now have automatic height and not hardcoded anymore
2020-11-14 16:07:11 +01:00
asasas9500
82d9dc4bea
Separate bridge floor and ceiling; Fix pushables
2020-11-11 15:01:45 -03:00
