Commit graph

352 commits

Author SHA1 Message Date
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
MontyTRC89
714e0a5ca2 Merge pull request #328 from MontyTRC89/new_objects_collision
Solid statics collision
2021-09-08 16:44:01 +02:00
Lwmte
f8ea09ea14 Replace all magic numbers with mesh flags 2021-09-08 15:01:19 +03:00
Troye
f5c03cf1e2 use SECTOR instead of WALL_SHIFT 2021-09-08 03:01:32 -05:00
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03: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
7e1141bcc4 Fix copypaste bug 2021-08-30 11:02:33 +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
Lwmte
ce1f4fad59 Fix idiocy 2021-08-29 00:00:15 +03:00
Lwmte
0b7c3d4a20 Merge branch 'master' into legacy_trigger_refactor 2021-08-28 21:38:58 +03:00
Lwmte
e082d8d435 Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct 2021-08-28 10:29:48 +03:00
MontyTRC89
5a9289f806 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
# Conflicts:
#	TR5Main/TombEngine.vcxproj
#	TR5Main/TombEngine.vcxproj.filters
2021-08-28 06:45:36 +02:00
MontyTRC89
d0da243f73 Refactored switches 2021-08-28 06:37:22 +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
933f9d8cf0 Remove more magic 2021-08-26 19:00:50 +03:00
Lwmte
5ace1a4c34 Rename effect.cpp to flipeffect.cpp to avoid confusions 2021-08-26 16:24:43 +03:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +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
edfb6d72d1 Further fixes 2021-08-25 06:33:15 +03:00
Lwmte
ec9479860f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
hispidence
cb1ad16b2d Remove more vestiges of old trigger system. Replace TO_LUA_SCRIPT with the enum that used to be there - TO_BODYBAG - so that the following enums still have their same values. 2021-08-23 22:05:58 +01:00
hispidence
99b730b06c Merge remote-tracking branch 'origin/master' 2021-08-23 02:03:20 +01:00
hispidence
9bf5c361e2 Clean up GameLogicScript.
Add some new member functions, ResetLevelTables and GetLevelFunc. The former is called in FreeLevelScripts, which is now called in control.cpp.

Remove AddTrigger, as the LevelFuncs table takes care of triggers.
2021-08-23 02:02:47 +01:00
MontyTRC89
9474284c87 Refactoring ID_LITTLE_BEETLES 2021-08-22 06:08:02 +02: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
Lwmte
1828ddaeab Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03:00
MontyTRC89
eebb8dfbba Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-20 05:26:07 +02: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
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
MontyTRC89
095423b30a Fixed locusts; First try of namespaces for objects; 2021-08-19 14:17:21 +02:00
hispidence
011c5b2222 Remove g_AudioTracks reference from a file where it's not used. 2021-08-17 13:15:38 +01:00
asasas9500
43bb0bc410 Remove hack remains 2021-08-16 18:19:40 -03:00
hispidence
97089fb2a6 Cast this bit too in service of killing warnings. 2021-08-12 22:17:08 +01:00
hispidence
561119ef09 Clean up some warnings. 2021-08-12 22:10:05 +01:00
hispidence
582b000fb9 Make OnControlPhase take a float, representing the delta time.
This is not ACTUALLY the amount of time that has passed, since things in the gameplay loop appear to assume they are being called thirty times per second, even if more or less time has passed. Thus to keep the scripts in sync with the the rest of the engine, we force a 1/30 second delta time.
2021-08-12 18:20:14 +01:00
Lwmte
7b9f01a1c4 Fix some lasersight issues 2021-08-11 15:18:22 +03:00
Lwmte
080658c416 Fix #289 2021-08-11 13:10:22 +03:00
hispidence
8e6ff2faee Fix what seems to be a copy-paste error (sky layer 2 doesn't seem to be implemented right now anyway, but still). 2021-08-07 19:25:55 +01:00
hispidence
0d8b9c881b Scope TITLE_TYPE usage. 2021-08-07 19:25:13 +01:00
hispidence
0974fc091c Fix old LARA_DRAW_TYPE usage with LARA_TYPE constants.
These don't need to be scoped, but I originally made it an enum class and plan to end up doing so down the line anyway, and this should save a bit of time there.
2021-08-07 19:24:39 +01:00