Commit graph

8102 commits

Author SHA1 Message Date
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
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
556f5e858d Add volumes for flyby cams (with heavy flag) 2021-08-30 16:13:27 +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
MontyTRC89
9bb64d4682 Merge pull request #311 from MontyTRC89/legacy_trigger_refactor
Floordata convenience improvements and de-corefication
2021-08-30 09:51:06 +02:00
Lwmte
b48c9d4483 More cleanup 2021-08-30 10:34:20 +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
hispidence
b5d8fe06ad Fix wrong function name. 2021-08-29 21:08:20 +01:00
hispidence
375e8012aa Add hopefully-temporary constexpr so that if I have to multiply by a pretend resolution at least it's not via magic numbers. 2021-08-29 21:08:07 +01:00
hispidence
a2303d022f Add the functions/properties SetPos, GetPos, col and key to DisplayString.
Add documentation too.
2021-08-29 20:28:40 +01:00
hispidence
fa5a6fd443 Add DisplayString "flags" and "translated" support, as well as some things I forgot to commit earlier. 2021-08-29 20:25:54 +01:00
hispidence
9a1831bc8f Remove PrintString; it has been "replaced" with DisplayString/AddString. 2021-08-29 20:11:29 +01:00
hispidence
8c1e290683 Rename AddDisplayString to SetDisplayString. Make it call insert_or_assign instead of just insert.
Add GetDisplayString and assorted types/static functions.
2021-08-29 20:09:59 +01:00
hispidence
3d1f2abd0b Add ScreenToPercent and PercentToScreen. 2021-08-29 20:03:51 +01:00
Lwmte
5fde174058 Merge branch 'master' into legacy_trigger_refactor 2021-08-29 20:18:41 +03:00
Lwmte
716f88b05f Fix trolling 2021-08-29 20:01:28 +03:00
Lwmte
15342f3259 Merge branch 'master' into legacy_trigger_refactor 2021-08-29 19:49:43 +03:00
hispidence
dde17f88cd Make MakeReadOnlyTable give the metatable its own metatable with an __index metamethod which raises an error (for now) when you use a variable that doesn't exist. 2021-08-29 17:07:19 +01:00
hispidence
cdf27e54d2 No good reason not to load Lua's math library that I can think of. 2021-08-29 17:05:43 +01:00
hispidence
e834d38522 Fix GameScriptColor's D3DCOLOR operator and __tostring, and add a converting constructor. 2021-08-29 17:05:06 +01:00
hispidence
d946f4c118 Add more reserved script names. 2021-08-29 17:03:51 +01: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
MontyTRC89
7954fb8d38 Placed some namespaces 2021-08-29 14:20:05 +02:00
Raildex
be16255efc Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Objects/TR4/Entity/tr4_sas.cpp
#	TR5Main/Objects/TR4/tr4_objects.cpp
2021-08-29 13:29:55 +02:00
Raildex
a707d19678 Moved creature_info.h into Game/ folder
Added converison functions for ITEM_DATA to keep syntax intact
2021-08-29 10:38:03 +02:00
Raildex
59987a69a7 Refactored several info types into separate files 2021-08-29 10:19:47 +02:00
Raildex
c6fcf8b248 Renamed creature.h to creature_info.h 2021-08-29 10:04:49 +02:00
Lwmte
4c8a2053ea Merge branch 'master' into legacy_trigger_refactor 2021-08-29 09:16:39 +03:00
MontyTRC89
ee4e95dd08 Cleaned ID_AHMET 2021-08-29 08:10:29 +02:00
MontyTRC89
3ec19f557d Fixed puzzles holes 2021-08-29 05:53:07 +02:00
Lwmte
1037d74cd1 Simplify GetSwitchTrigger/GetKeyTrigger 2021-08-29 00:56:16 +03:00
Lwmte
ce1f4fad59 Fix idiocy 2021-08-29 00:00:15 +03:00
Lwmte
097ea56092 Update TombEngine.vcxproj.filters 2021-08-28 22:09:57 +03:00
Lwmte
9f60b228a7 Manually fix merge conflicts 2021-08-28 21:43:47 +03:00
Lwmte
0b7c3d4a20 Merge branch 'master' into legacy_trigger_refactor 2021-08-28 21:38:58 +03:00
MontyTRC89
2b0624b166 Fixed ID_SAS_DRAG_BLOKE; Added namespaces to SAS functions; 2021-08-28 19:12:19 +02:00
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Raildex
dabbeb88db Fixed Include Hell for Creature Info 2021-08-28 12:16:03 +02: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
hispidence
434b1f146e Change PrintString arg names to better reflect what it does. 2021-08-27 19:08:28 +01:00
hispidence
96441572bf Make default s_callbackRemoveName not throw. 2021-08-27 19:07:55 +01:00
hispidence
6bc5a561a0 Make variables an unordered_map for consistency and speed. 2021-08-27 19:04:03 +01:00
hispidence
aefe320bb0 Add OnStart, OnEnd and FreeLevelScript calls to DoTitle. 2021-08-27 19:03:23 +01:00
hispidence
77c4e709ac Add calls to SetCallbackDrawString and ProcessDisplayStrings. 2021-08-27 19:02:10 +01:00