Commit graph

1896 commits

Author SHA1 Message Date
hispidence
b8b6800071 Update compiled docs. 2021-08-30 18:46:48 +01:00
hispidence
62ca97839d Merge branch 'master' into displaystrings 2021-08-30 18:44:21 +01:00
hispidence
74629db9d3 Make SetLevelFunc and GetLevelFunc only store the function in m_levelFuncs.
Store the function in m_levelFuncs instead of the table itself.
2021-08-30 18:21:42 +01:00
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
aae46a5f3f Move some more stuff to trigger.cpp 2021-08-30 17:52:38 +03:00
Lwmte
d2f4576b27 Move trigger functions into separate file 2021-08-30 17:50:32 +03:00
Lwmte
7ace89c1d5 Add volumes for flyby cams (with heavy flag) 2021-08-30 16:13:27 +03:00
Lwmte
56c71d1fe6 Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +03:00
Lwmte
c04afb30fe Fix copypaste bug 2021-08-30 11:02:33 +03:00
MontyTRC
a88aafef72
Merge pull request #311 from MontyTRC89/legacy_trigger_refactor
Floordata convenience improvements and de-corefication
2021-08-30 09:51:06 +02:00
Lwmte
1115b9d5f5 More cleanup 2021-08-30 10:34:20 +03:00
Lwmte
e2e20a2497 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
hispidence
f52a8455a4 Fix wrong function name. 2021-08-29 21:08:20 +01:00
hispidence
b7354c16f7 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
893eb4984f Add the functions/properties SetPos, GetPos, col and key to DisplayString.
Add documentation too.
2021-08-29 20:28:40 +01:00
hispidence
861720dce0 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
1cde8877e4 Remove PrintString; it has been "replaced" with DisplayString/AddString. 2021-08-29 20:11:29 +01:00
hispidence
9a2d1a0f2d 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
501be9c594 Add ScreenToPercent and PercentToScreen. 2021-08-29 20:03:51 +01:00
Lwmte
e5945b578e Merge branch 'master' into legacy_trigger_refactor 2021-08-29 20:18:41 +03:00
Lwmte
03a0bb37d5 Fix trolling 2021-08-29 20:01:28 +03:00
Lwmte
4badfde0dc Merge branch 'master' into legacy_trigger_refactor 2021-08-29 19:49:43 +03:00
hispidence
75e6f14287 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
169f5445e8 No good reason not to load Lua's math library that I can think of. 2021-08-29 17:05:43 +01:00
hispidence
2e2d849092 Fix GameScriptColor's D3DCOLOR operator and __tostring, and add a converting constructor. 2021-08-29 17:05:06 +01:00
hispidence
5e525bb545 Add more reserved script names. 2021-08-29 17:03:51 +01:00
MontyTRC89
d6133d393a Placed some namespaces 2021-08-29 14:20:05 +02:00
Lwmte
8f990d5d5b Merge branch 'master' into legacy_trigger_refactor 2021-08-29 09:16:39 +03:00
MontyTRC89
09ed0381ac Cleaned ID_AHMET 2021-08-29 08:10:29 +02:00
MontyTRC89
94dfbd2c92 Fixed puzzles holes 2021-08-29 05:53:07 +02:00
Lwmte
1d2af1238a Simplify GetSwitchTrigger/GetKeyTrigger 2021-08-29 00:56:16 +03:00
Lwmte
efa66ca8ff Fix idiocy 2021-08-29 00:00:15 +03:00
Lwmte
f946437c5e Update TombEngine.vcxproj.filters 2021-08-28 22:09:57 +03:00
Lwmte
be47484def Manually fix merge conflicts 2021-08-28 21:43:47 +03:00
Lwmte
1de60cfc1c Merge branch 'master' into legacy_trigger_refactor 2021-08-28 21:38:58 +03:00
MontyTRC89
86c79a4f7f Fixed ID_SAS_DRAG_BLOKE; Added namespaces to SAS functions; 2021-08-28 19:12:19 +02:00
Lwmte
0b86ca1f67 Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct 2021-08-28 10:29:48 +03:00
MontyTRC89
556b8b90a9 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
d3e6bfc7dd Refactored switches 2021-08-28 06:37:22 +02:00
hispidence
72f925c3bc Change PrintString arg names to better reflect what it does. 2021-08-27 19:08:28 +01:00
hispidence
34e187aa81 Make default s_callbackRemoveName not throw. 2021-08-27 19:07:55 +01:00
hispidence
f74460d8f8 Make variables an unordered_map for consistency and speed. 2021-08-27 19:04:03 +01:00
hispidence
b765ce9be1 Add OnStart, OnEnd and FreeLevelScript calls to DoTitle. 2021-08-27 19:03:23 +01:00
hispidence
7527ac28ca Add calls to SetCallbackDrawString and ProcessDisplayStrings. 2021-08-27 19:02:10 +01:00
hispidence
a61e2fd0b0 Implement ShowString, HideString, and PrintString. 2021-08-27 18:56:35 +01:00
hispidence
42de0ec1b8 Update VS proj with new files. 2021-08-27 18:50:24 +01:00
hispidence
a3adcd9f8a Add GameScriptDisplayString.h and .cpp. 2021-08-27 18:49:59 +01:00
hispidence
2ea41e96f6 AddLuaName* -> AddName 2021-08-27 18:49:14 +01:00
hispidence
68118bc9a3 Replace Get*ByName with GetByName, AddLuaName* with AddName, and RemoveLuaName* with RemoveName. Replace m_*MapName with m_nameMap. Use a std::variant for the types that m_nameMap elements could be. Modify SetNameCallbacks params to be variadic. These do make it look more complex, but also make it more generic, and mean that specific parameters do not need to be repeated (which will make it easier if/when we change said parameters). 2021-08-27 18:21:37 +01:00
hispidence
df5353d0c2 Add ReservedScriptNames.h. This holds some static const strings to be used as template arguments. 2021-08-27 18:11:59 +01:00