Lwmte
c1fc33ab52
Fix regressions
2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868
Merge branch 'doors_refactoring'
...
# Conflicts:
# TR5Main/Game/door.cpp
# TR5Main/Game/door.h
# TR5Main/Game/memory/malloc.cpp
# TR5Main/Objects/Generic/Switches/cog_switch.cpp
# TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
# TR5Main/Objects/Generic/Switches/generic_switch.h
# TR5Main/Objects/Generic/Switches/turn_switch.cpp
# TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-09-11 05:38:26 +02: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
MontyTRC89
e06a79ffc9
Merge branch 'master' into bitshifts_2
2021-09-08 16:20:28 +02:00
Raildex
eb5c23bd89
Merge branch 'master' into item_data
2021-09-05 10:08:23 +02:00
Lwmte
986ee1d510
Fix climbing
2021-09-04 15:43:37 +03: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
Troye
84cc6d9c7f
revert to bitshits in Game folder; handle lack of inv objects;
2021-08-30 15:13:18 -05:00
Lwmte
d8434b62ec
Move some more stuff to trigger.cpp
2021-08-30 17:52:38 +03:00
Lwmte
9669544577
Move trigger functions into separate file
2021-08-30 17:50:32 +03:00