Commit graph

93 commits

Author SHA1 Message Date
Sezz
85df2ed1b1 ITEM_INFO cleanup; rename some structs to comply with TEN conventions; LaraInfo cleanup 2022-03-13 02:04:24 +11:00
Sezz
683c830259 WIP slope experiments; LaraInfo cleanup; cleanup 2022-03-08 18:22:14 +11:00
Sezz
e7d46207b1 Entity cleanup 2022-03-07 14:30:56 +11:00
Sezz
0091bc84d2 Move more members from ITEM_INFO into CreatureInfo; cleanup 2022-03-06 20:45:50 +11:00
Sezz
3a8596f0bf CreatureInfo cleanup; LOTInfo cleanup; move some ITEM_INFO members into CreatureInfo; cleanup 2022-03-06 18:59:04 +11:00
Sezz
038137d033 Object file cleanup 2022-02-25 22:22:13 +11:00
Sezz
b6dbd5d362 Cleanup 2022-02-12 16:25:59 +11:00
Sezz
ed6ac2d7bc Rename ITEM_INFO members to comply with conventions 2022-02-09 16:55:46 +11:00
Sezz
0eaf6f9d02 Begin tidying ITEM_INFO; update savegame schema 2022-02-09 13:20:57 +11:00
Sezz
be08902a5c Tentatively rename animation-related ITEM_INFO members 2022-02-02 20:16:16 +11:00
Sezz
29b2f68870 Fix(?) portal traversal in UpdateItemRoom(); round floats in TranslateItem() 2022-02-02 18:28:23 +11:00
Sezz
948575752c Rename gravityStatus to airborne 2022-01-21 23:23:10 +11:00
Lwmte
8f4ba68f30 Reorganize includes tier 3 2021-12-24 03:32:19 +03:00
Lwmte
2101d3e65f Reorganize includes tier 2 2021-12-22 16:23:57 +03:00
Lwmte
2671ca453b Collide code reorganizing (#393)
* Tier 1

* Tier 2

* Remove old GetRoomList implementation and use CollectConnectedRooms one

* Tier 3

* Tier 4

* Tier 5

* Tier 6

* Tier 7

Co-authored-by: Lwmte <initiator@nm.ru>
2021-12-19 05:24:12 +03:00
Lwmte
520ad0eacf Possibly fix crashes with objects without meshes 2021-12-18 23:08:09 +03:00
Lwmte
9d7defcc29 Fix epic bug 2021-12-13 02:57:21 +03:00
Lwmte
652d0ff2fd Clean up ITEM_INFO 2021-11-27 17:50:58 +03:00
Lwmte
afc072d350 Save bridge objects collision on load/save and on flipmap 2021-11-23 01:31:09 +03:00
Lwmte
8a738a96a1 Reset mutators in generic object init 2021-09-24 23:34:26 +03:00
Lwmte
6c29ba5442 Fix everything 2021-09-24 13:50:31 +03:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
32b48e9c24 Rename some functions 2021-09-17 16:07:53 +03:00
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +03:00
Lwmte
1284d34f68 Implement basic flash, fix func names 2021-09-15 14:24:03 +03:00
Lwmte
798b54680e Replace usage of legacy average floor/ceiling values 2021-09-14 14:38:59 +03:00
Lwmte
dc6c3fa72d Rename remaining legacy fields in FLOOR_INFO 2021-09-13 02:51:52 +03:00
Lwmte
28aeceac98 Rename box 2021-09-13 02:46:48 +03:00
Lwmte
c81fcfe43e Fix merge conflicts 2021-09-09 11:25:03 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
Raildex
31ec83f9cc Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
MontyTRC89
cea3608a25 Cleaned collision code; Cleaning AI code; Usin visibility for for statics culling; Fixed Lara crawling; 2021-09-04 07:53:21 +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
Raildex
e7f2632c99 Fixed Door crashes by doing a simple copy of the floor data instead of memcpy
Using resize() insteaad of clear() for vectors in LEVEL to force a deallocation
2021-08-30 17:28:26 +02:00
Raildex
44c454318f Cleaned up several buffers to use fixed arrays
Removed game_malloc
TODO: DOOR_DATA destructor crashes
2021-08-29 16:35:19 +02: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
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
hispidence
1e38b88339 Set luaName to blank in CreateItem to indicate the lack of a name. 2021-07-17 23:49:40 +01:00
hispidence
54e14ccb3f Make some functions take a GAME_OBJECT_ID instead of a short. Make AIOBJECT use a GAME_OBJECT_ID instead of a short. 2021-07-11 16:55:20 +01:00
Trxye
e2b0178cb8 InitialiseObelisk(); some of ObeliskControl() 2021-06-09 22:48:18 -05:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
97cc77446a Fixed bug in ItemNewRoom 2021-05-24 09:27:52 +02:00
MontyTRC89
5c39ead909 Fixed ID_SAS; Fixed serious bugs with CreatureActive(); Fixed grenades;' 2021-04-29 06:26:30 +02:00
asasas9500
ad446ad534 Improve FindItem() 2021-02-07 17:12:41 -03:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
Woops
2ce98f1e8f remove bitshifts from the "Game" folder 2020-10-06 12:44:14 -05:00
MontyTRC89
211263afac Fixed Lara damage on grenade hit; Fixed EffectList[] init; getBoneMatrix now valid for both Lara and other items; Added code (not working yet) for enemy explosion death; 2020-08-09 20:29:31 +02:00