Lwmte
202bf42a12
Rename box
2021-09-13 02:46:48 +03:00
Lwmte
9554f8741a
Rename some legacy fields, restore footsteps
2021-09-13 02:07:42 +03:00
Lwmte
e509290192
Merge branch 'master' into coll_info_reorganize
2021-09-10 10:11:15 +03:00
Lwmte
8136b41f42
Simplify COLL_POSITION
2021-09-10 00:43:26 +03:00
Lwmte
4186dfe685
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
9af21e3146
Further code organizing
2021-09-08 18:19:06 +03:00
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
Nils
0af567b7fd
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
Nils
7f774d04b3
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
e879038220
Fix namespace case
2021-08-30 18:03:21 +03:00
Lwmte
e2e20a2497
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
2021-08-29 23:53:58 +03:00
Nils
cb43604806
Integrated ITEM_DATA into ITEM_INFO
...
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
Nils
58eda862e3
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
Lwmte
7cfe471c26
Cleanup a bit more
2021-08-26 19:55:34 +03:00
Lwmte
5e48c0350e
Rename effect.cpp to flipeffect.cpp to avoid confusions
2021-08-26 16:24:43 +03:00
Lwmte
7b8fc9bef2
Make flipeffect names consistent
2021-08-26 16:11:04 +03:00
Lwmte
932ccc40d1
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
e0b47d629f
Merge branch 'master' into legacy_trigger_refactor
2021-08-24 19:04:54 +03:00
Lwmte
0b8ca4fa54
Replace all remaining occurences of coll globals
2021-08-24 16:54:26 +03:00
MontyTRC89
109b7d6e18
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
422ac5dad2
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
6b5a932ff8
Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall;
2021-05-26 06:04:32 +02:00
KrysB4k
7f9363dbac
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
cbe9b33ff4
Tiny fix
2021-02-04 02:01:29 +01:00
KrysB4k
406c309c56
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
b85bf6cf33
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
4d54339423
Adjust calls to AddBridge and RemoveBridge in pushables
2021-02-01 17:29:33 +01:00
asasas9500
decead6658
Merge branch 'PushableOCB' of https://github.com/MontyTRC89/TR5Main into PushableOCB
2021-01-27 01:12:04 -03:00
asasas9500
9c5bcb3b84
Reimplement virtual rooms into floordata
2021-01-27 01:04:31 -03:00
KrysB4k
2ac8a444ee
Fix pushing pushables into bridges
...
Swapped pushable_info function for a simple #define
2021-01-18 13:41:59 +01:00
KrysB4k
936bce737a
Merge remaining features of VirtualRooms
2021-01-16 18:38:16 +01:00
asasas9500
184427ea05
Merge branch 'VirtualRooms' into PushableOCB
2021-01-16 11:39:52 -03:00
asasas9500
f8e4ebce26
Revert changes to pushable block
2021-01-16 11:27:27 -03:00
asasas9500
95fe660864
Revert "Fix pushable collision bug"
...
This reverts commit 8eb40d79e5
2021-01-16 11:05:14 -03:00
asasas9500
e0130a7a48
Revert "Fixed comment"
...
This reverts commit 8969fdfdef
2021-01-16 11:04:50 -03:00
KrysB4k
8969fdfdef
Fixed comment
2021-01-12 20:17:38 +01:00
KrysB4k
8eb40d79e5
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
7bbb65581a
Implement virtual rooms into floordata
2021-01-06 17:53:13 -03:00
KrysB4k
d1aed5c4b5
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
cf1db753da
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
e5a59a1419
Removed mistakes with previous commit
2020-12-25 01:36:28 +01:00
KrysB4k
a6a9050d4a
Revert "Pushables: Fix error in stack height code, use bbox Y1 value for non-rigid pushables"
...
This reverts commit 21977d5eba
2020-12-25 01:31:17 +01:00
KrysB4k
21977d5eba
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
6d4604af32
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
d4c6cc4a97
Fix line endings
2020-12-21 13:16:29 -03:00
KrysB4k
658289f603
Stackable pushables
2020-12-21 04:13:14 +01:00
KrysB4k
fe65351aa8
Pushables: parse CollidedItems array for objects with floor procedures
2020-12-20 19:31:07 +01:00
asasas9500
d45f69ac0b
Fix stacked bridges
2020-12-20 14:04:27 -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
Montagna Marco
880c4af49e
Raising blocks now have automatic height and not hardcoded anymore
2020-11-14 16:07:11 +01:00
