Commit graph

123 commits

Author SHA1 Message Date
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12:19 +03:00
Lwmte
c324f70774 Organize control.h too 2021-09-15 22:43:19 +03:00
Lwmte
68923228dd Remove unused globals and move others from control.cpp to needed source files 2021-09-15 21:09:09 +03:00
Lwmte
2e62725933 Move flipmap stuff out of control.cpp 2021-09-15 17:40:00 +03:00
Lwmte
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
26cd489da6 Move FlashFader to environment controller 2021-09-15 12:58:07 +03:00
Lwmte
e289644e87 Move flipeffect global to filpeffect.cpp 2021-09-15 11:38:55 +03:00
Lwmte
81af7bea10 Move wind to weather controller 2021-09-15 11:13:47 +03:00
Lwmte
7f16b66dfc Simplify trigger handling code 2021-09-15 10:12:42 +03:00
Lwmte
17ff197dc7 Merge branch 'coll_info_reorganize' into sky_fix 2021-09-14 12:08:05 +03:00
Lwmte
5e9d243ac0 Move PlaySoundTrack to sound code 2021-09-13 11:16:48 +03:00
Lwmte
bb775ff6c2 Demagic NO_LOS_ITEM 2021-09-13 10:22:00 +03:00
Lwmte
e3df0a4960 CheckNoColFloorTriangle enum 2021-09-13 03:20:53 +03:00
Lwmte
7854679a69 Remove all floordata legacy code 2021-09-11 22:41:25 +03:00
Lwmte
8d8ca9fdd9 Merge branch 'coll_info_reorganize' into sky_fix 2021-09-10 14:04:29 +03:00
Lwmte
42a6e45bca Merge branch 'master' into sky_fix 2021-09-10 14:04:00 +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
1efe0a9f09 Reorganize COLL_INFO 2021-09-10 00:18:47 +03:00
Lwmte
b9ff80220e Move all sky stuff to renderer 2021-09-09 13:30:49 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
3fe6211e4e Further organizing 2021-09-08 18:31:35 +03: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
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
Lwmte
81c6e1f770 Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +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
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
968df0ed59 Remove OnObject global 2021-08-27 19:29:18 +03:00
Lwmte
7d4fde9942 Cleanup a bit more 2021-08-26 19:55:34 +03:00
Lwmte
9331bcea04 Merge branch 'master' into legacy_trigger_refactor 2021-08-26 19:49:09 +03:00
Lwmte
886fece473 Cleanup sound code 2021-08-26 19:47:59 +03:00
Lwmte
1f68fd812b Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
c9de2c6aeb Fix building 2021-08-26 10:31:58 +03:00
Lwmte
ec9479860f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
2756a65095 COLL_RESULT conversion in progress (broken) 2021-08-22 01:39:14 +03:00
Lwmte
d394bcc39f Completely get rid of TriggerIndex 2021-08-20 15:26:12 +03:00
hispidence
10419d15a8 Fixed some GameFlowScript.cpp warnings:
Remove SkyVelocity1 and SkyVelocity2 - they weren't being used.
Change a loop var to a size_t.
Make GameScriptInventoryObject.yOffset a short.
2021-08-20 02:42:47 +01:00
Lwmte
48aefdeee6 First commit 2021-08-20 02:01:50 +03:00
Lwmte
408bbf8e73 Fix controls lockup if level was changed during flyby with disabled controls 2021-08-05 14:26:23 +03:00
MontyTRC89
0495681cb1 Fixed volumes and added debug message 2021-07-15 10:56:03 +02:00
MontyTRC89
1effeed738 Refactored cameras, sinks and sound sources; Added sound sources playback; 2021-07-10 06:55:37 +02:00
MontyTRC89
a4d3ec9d26 Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
asasas9500
12ebf162ad Delete leftover code 2021-02-07 01:20:50 -03:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -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
asasas9500
d0a930978f Implement new random system 2020-10-24 01:05:59 -03:00
asasas9500
547b643232 Merge branch 'master' into NoShifts 2020-08-25 19:25:28 -03:00