MontyTRC89
e7eba9c30b
Removed closed doors
2021-09-12 05:09:20 +02:00
Lwmte
744325bea2
Revert "Fix regressions"
...
This reverts commit c1fc33ab52
2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52
Fix regressions
2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868
Merge branch 'doors_refactoring'
...
# Conflicts:
# TR5Main/Game/door.cpp
# TR5Main/Game/door.h
# TR5Main/Game/memory/malloc.cpp
# TR5Main/Objects/Generic/Switches/cog_switch.cpp
# TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
# TR5Main/Objects/Generic/Switches/generic_switch.h
# TR5Main/Objects/Generic/Switches/turn_switch.cpp
# TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-09-11 05:38:26 +02: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
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
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02: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
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
5f66005277
Remove j.
2021-08-23 19:22:31 +01:00
hispidence
bc9e863307
Give documentation comments new tag names. Part 2 of making the documentation better.
2021-08-23 19:16:24 +01:00
hispidence
bdbded2221
Rename ItemInfo functions newItem and newItemTemporary to new and newTemporary for consistency.
2021-08-23 02:07:17 +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
hispidence
369e4c7562
Add and fix documentation.
2021-08-21 00:29:54 +01:00
hispidence
afdec32c1f
Fix GetFrameNumber, SetFrameNumber, GetAnimNumber and SetAnimNumber.
2021-08-21 00:25:15 +01:00
hispidence
a75b43b7c5
Implement ScriptAssertF and ScriptAssertTerminateF.
...
These are like ScriptAssert, but make use of the fmt library (atm hijacking the version that comes with spdlog). This allows us to pass in a format string and some args, and then only create the format string if there's an actual error. This means we won't waste time doing a ton of std::string concatenations if the assert succeeds.
As these are variadic templates, we can't use a std::optional as the last argument to check if we're forcing a different error mode (we possibly could by assuming the last arg is a std::optional, but that seems unclean), so instead I've just separated them out into two functions.
2021-08-21 00:23:14 +01:00
hispidence
f83add0f4c
Float->short to fix a warning.
2021-08-21 00:16:22 +01:00
hispidence
6c3f2d1673
Update SetScriptErrorMode call.
2021-08-21 00:15:56 +01:00
hispidence
8d84ee6f3f
Rename SetErrorMode to SetScriptErrorMode to avoid VS getting confused by some MS function with the same name. Add GetScriptErrorMode.
2021-08-21 00:13:44 +01:00
hispidence
a20cad7ed6
Remove obsolete class.
2021-08-20 03:01:32 +01:00
hispidence
1d052a73e1
Remove comments; these are technically no longer unused as they're linked up with Lua variables.
2021-08-20 02:43:56 +01: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
hispidence
2039df5a27
Add newindex error to SoundSourceInfo.
2021-08-20 01:51:51 +01:00
hispidence
1e2a2bfa63
Fix some documentation.
2021-08-20 01:51:16 +01:00
hispidence
93483e76ef
Add unlimitedAir documentation comment.
2021-08-20 01:48:06 +01:00
hispidence
51c3ffe3d3
Give newindex errors to script classes which already have index errors.
2021-08-20 01:41:14 +01:00
hispidence
178b66978a
Move index_error_maker into new file (ScriptUtil.h). Add newindex_error_maker. Make them call ScriptAssert instead of just throwing an exception so it won't terminate the application on WARN or SILENT error modes.
2021-08-20 01:37:49 +01:00
hispidence
07a756a369
Remove some unused includes.
2021-08-17 14:23:47 +01:00
hispidence
9b4cd106d1
Make some getters const.
2021-08-17 13:37:08 +01:00
hispidence
672f90e238
Add documentation for SetGameFarView, Level.FarView, and Level.UVRotate, as well as some value checking.
2021-08-17 13:36:34 +01:00
hispidence
3a01ec6629
Fix assert error message.
2021-08-17 00:30:21 +01:00
hispidence
b8521b5224
Fail assert if string is not found.
2021-08-16 12:52:45 +01:00
hispidence
af84f318b6
Document errorMode. Make it an enum on the Lua side rather than a string.
2021-08-16 12:52:06 +01:00
hispidence
3f3b259cb9
Make window title a strings.lua string instead.
2021-08-15 23:23:33 +01:00
hispidence
0fd15ad18d
Make AudioTrack documentation stub.
2021-08-15 23:07:22 +01:00
hispidence
813b8bb42a
Add documentation comments in GameFlowScript.cpp.
...
Move windowTitle from GameScriptSettings to GameFlowScript and rename it to SetWindowTitleKey.
2021-08-15 23:04:56 +01:00
hispidence
93117c56a3
Fix some documentation.
2021-08-12 22:11:50 +01:00
hispidence
adcee07c68
Fix some GameLogic documentation.
2021-08-12 20:14:40 +01:00
hispidence
c8de277d44
Remove GetLara as the Lara object is easier to use.
...
Add documentation for the Lara object.
2021-08-12 20:14:02 +01:00
hispidence
cd16268e19
Actually add documentation.
2021-08-12 19:58:22 +01:00
hispidence
3efa8f16b7
Take CalculateDistance and CalculateHorizontalDistance out of header file as they can be static now.
...
Add documentation for said functions.
2021-08-12 19:57:17 +01:00
hispidence
53cd3add4f
Register CalculateDistance and CalculateHorizontalDistance in GameLogicScript.
2021-08-12 19:54:03 +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
hispidence
196646297b
Amend doc comment.
2021-08-12 17:20:09 +01:00
hispidence
adf1361d99
Fix documentation; Level -> LevelVars.
2021-08-12 02:43:59 +01:00
hispidence
ea1649b7b1
Make "loop" arg to PlayAudioTrack optional; defaulting to false.
2021-08-12 02:39:29 +01:00
hispidence
b708a6068d
Add comments and update documentation for InventoryAdd/InventoryRemove.
2021-08-12 02:38:30 +01:00
hispidence
c1b46afd62
Rename Lua tables Game and Level to GameVars and LevelVars to disambiguate the latter from the Level class.
2021-08-12 00:39:52 +01:00
