Commit graph

8102 commits

Author SHA1 Message Date
hispidence
e63153cc88 Implement ShowString, HideString, and PrintString. 2021-08-27 18:56:35 +01:00
hispidence
04710bc1bd Update VS proj with new files. 2021-08-27 18:50:24 +01:00
hispidence
538fe191a8 Add GameScriptDisplayString.h and .cpp. 2021-08-27 18:49:59 +01:00
hispidence
6cf9120415 AddLuaName* -> AddName 2021-08-27 18:49:14 +01:00
hispidence
5a5ca519dc 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
b71555efa8 Add ReservedScriptNames.h. This holds some static const strings to be used as template arguments. 2021-08-27 18:11:59 +01:00
hispidence
b5fe8904c1 Add IdentifierType for named script types. This is in an effort to consolidate a lot of very similar functions into a few templates. 2021-08-27 18:10:19 +01:00
Lwmte
968df0ed59 Remove OnObject global 2021-08-27 19:29:18 +03:00
Lwmte
5a644332e9 Fix crash if caustics are missing 2021-08-27 17:01:54 +03:00
hispidence
f7cff1076e Add comment for prev commit. 2021-08-27 14:32:00 +01:00
hispidence
824a65e603 Make GameScriptColor able to convert to D3DCOLOR. 2021-08-27 14:30:41 +01:00
Lwmte
4f06d91ff6 Fix grenades destroying environment and not doing damage on Lara 2021-08-27 16:30:03 +03:00
Lwmte
414e22c7d4 Fix incorrect height calc 2021-08-27 15:48:22 +03:00
hispidence
578724a9c6 Set callbacks to nil and collect garbage when unloading level. 2021-08-27 12:46:01 +01:00
Lwmte
d06084fc1b Update lara.cpp 2021-08-26 19:55:52 +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
b2831172af Make flipeffect names consistent 2021-08-26 16:11:04 +03:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
a2d72931b5 Update effect.cpp 2021-08-26 14:59:59 +03:00
Lwmte
4d42bbeee5 Cleanup collide.cpp a bit more 2021-08-26 14:58:06 +03:00
Lwmte
465d282123 Rename DoObjectDynamics to DoProjectileDynamics 2021-08-26 14:13:29 +03:00
Lwmte
a044674690 Merge branch 'master' into legacy_trigger_refactor 2021-08-26 14:11:29 +03:00
Lwmte
fbb6c79ee8 Update TombEngine.sln 2021-08-26 14:11:03 +03:00
Lwmte
b42a7ba096 Remove more magic 2021-08-26 13:47:47 +03:00
Lwmte
c74fd2c3da Remove magic numbers from GetCollisionInfo 2021-08-26 13:06:24 +03:00
Lwmte
45b6724f92 Move and rename DoProperDetection to collide.cpp 2021-08-26 12:37:46 +03:00
Lwmte
1f68fd812b Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
12d8650176 Remove GetTiltType, swap wrongly named TiltX/TiltZ variables (mistake by Core) 2021-08-26 11:39:08 +03:00
Lwmte
7af5b0a34c Fix git mess 2021-08-26 11:35:02 +03:00
Lwmte
9b25b01f8a Merge branch 'master' into legacy_trigger_refactor 2021-08-26 10:41:50 +03:00
Lwmte
d7c5487a38 Fix release build and resolve build warning about bad project name 2021-08-26 10:41:07 +03:00
Lwmte
c9de2c6aeb Fix building 2021-08-26 10:31:58 +03:00
MontyTRC89
82898fe37b Refactoring switches; Moved crowbar switch and underwater switches to separated files; 2021-08-26 05:46:10 +02:00
Lwmte
54d649899d Merge branch 'master' into legacy_trigger_refactor 2021-08-26 00:38:21 +03:00
MontyTRC89
a12247a287 Refactoring switches; Fixed ID_JUMP_SWITCH and ID_LEVER_SWITCH; 2021-08-25 09:42:17 +02:00
MontyTRC89
5129f0e064 Fixed ID_COG_SWITCH 2021-08-25 08:16:35 +02:00
Lwmte
ca36cb5a47 Fix skeleton crash 2021-08-25 09:14:32 +03:00
Lwmte
3378c8791a Organize COLL_INFO 2021-08-25 06:54:17 +03:00
Lwmte
edfb6d72d1 Further fixes 2021-08-25 06:33:15 +03:00
Lwmte
867f16f467 Cleanup and comment GetCollisionInfo 2021-08-25 05:45:10 +03:00
MontyTRC89
0747fa12bd Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-24 18:19:21 +02:00
MontyTRC89
da2043b883 Fixed bug on align Lara position; Cleaning puzzle holes code; 2021-08-24 18:19:15 +02:00
Lwmte
ec9479860f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
70626854f0 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
hispidence
770a791c0d Make ExecuteFunction print a better error message with the name of the function. 2021-08-23 22:07:18 +01:00
hispidence
d0b488a488 Replace a cout with a TENLog. 2021-08-23 22:06:36 +01:00