Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-11 21:16:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2680 commits 62 branches 10 tags 507 MiB
Commit graph

76 commits

Author SHA1 Message Date
hispidence
8a31dbf644 Move scripting source files into new filder. Obviously, these won't work yet or even compile. 2021-12-14 21:10:21 +00:00
hispidence
0b433edfe2 Include frameworkandsol.h instead of framework.h and sol.hpp. 2021-12-04 21:15:26 +00:00
hispidence
5613d0cf74 g_gameScript is now a ScriptInterfaceGame. 2021-11-29 21:54:36 +00:00
Lwmte
2623607b70 Rename newinv2 to gui 2021-11-16 15:51:50 +03:00
Lwmte
a2fdd7418c Tier 2 2021-11-16 14:52:52 +03:00
Lwmte
158330b53e Cleanup savegame and sound code 2021-10-31 23:55:17 +03:00
Lwmte
462770767c Restore background track on savegame reload 2021-10-29 03:39:22 +03:00
Lwmte
18bddbf7e8 Refactor and fix sound code 2021-10-29 02:22:26 +03:00
Lwmte
1d259e3678 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
MontyTRC89
5c84fd1e33 Linked all the coded for loading and saving 2021-10-15 05:55:22 +02:00
MontyTRC89
4e2eecee8b Working on new savegames, first prototype load and save (missing UI) 2021-10-11 10:44:28 +02:00
Troye
6c0e7645fb W1 2021-09-25 16:03:28 -05:00
Lwmte
2b49b9aa42 Fix more stuff 2021-09-16 01:12:19 +03:00
Lwmte
42bb372f63 Remove unused globals and move others from control.cpp to needed source files 2021-09-15 21:09:09 +03:00
Lwmte
ff6b52b754 Move all sky stuff to renderer 2021-09-09 13:30:49 +03:00
Lwmte
9af21e3146 Further code organizing 2021-09-08 18:19:06 +03:00
hispidence
1cccef16b2 Give documentation comments new tag names. Part 2 of making the documentation better. 2021-08-23 19:16:24 +01:00
hispidence
5280feb812 Update SetScriptErrorMode call. 2021-08-21 00:15:56 +01:00
hispidence
ad7c6fddd1 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
6df0bb5252 Remove some unused includes. 2021-08-17 14:23:47 +01:00
hispidence
3329523091 Make some getters const. 2021-08-17 13:37:08 +01:00
hispidence
906d583e7f Add documentation for SetGameFarView, Level.FarView, and Level.UVRotate, as well as some value checking. 2021-08-17 13:36:34 +01:00
hispidence
9271172129 Fail assert if string is not found. 2021-08-16 12:52:45 +01:00
hispidence
e5d12a56f2 Document errorMode. Make it an enum on the Lua side rather than a string. 2021-08-16 12:52:06 +01:00
hispidence
b574a9b899 Make window title a strings.lua string instead. 2021-08-15 23:23:33 +01:00
hispidence
99e056b3c7 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
b480ea23f7 Amend doc comment. 2021-08-12 17:20:09 +01:00
hispidence
b24d6e8841 Update GameFlowScript to account for the changes made to GameScriptInventoryObject. 
Add FROM_DEGREES calls to fix the "rot" property.
 2021-08-11 01:28:37 +01:00
hispidence
8de08be1de Register GameScriptRotation in GameFlowScript and not GameLogicScript. 2021-08-11 01:26:35 +01:00
hispidence
5458e7a67e Make the read-only table of kInventorySlots in GameFlowScript instead of GameLogicScript. 2021-08-08 23:53:52 +01:00
hispidence
9fbb3cc7b7 Improve GameScriptLevel. 
Rename LARA_DRAW_TYPE to LARA_TYPE as it's used in more than just drawing code. Make WEATHER_TYPE a scoped enum (would have done this for LARA_TYPE too but didn't want to pepper casts in other parts of the codebase). Relabel constants in both enums.

Add kLaraTypes and kWeatherTypes and add them as tables in GameFlow.

Remove Background member - it's not level-specific so GameFlow is a better home for it.

Add (incomplete for now) documentation for some GameScriptLevel members - those I tested, at any rate.
 2021-08-07 19:20:17 +01:00
hispidence
f4ef0dc468 Clean up GameFlowScript. 
Remove a lot of members which were unused and which represented level properties already accounted for in GameScriptLevel.

Make TITLE_TYPE an enum class and relabel its values.

Add TitleScreenImagePath and SetTitleScreenImagePath, which replaces GameScriptLevel's Background member.

Register GameScriptColor in GameFlowScript since we will be using it for the fog and sky layer properties of levels.
 2021-08-07 19:13:36 +01:00
hispidence
3fc779a60b Add ErrorMode to GameScriptSettings (C++) and errorMode to settings (Lua). Call SetErrorMode in LoadGameFlowScript. 2021-08-06 16:44:37 +01:00
hispidence
58a424e52f Change ExecuteScript and ExecuteString to return void and throw a TENScriptException on error. Remove my old comments which didn't really add info. Implement SetSettings. 2021-08-03 15:12:24 +01:00
hispidence
8b7928d83e Missed these in the last commit. 2021-07-28 19:06:15 +01:00
hispidence
e33e821cb8 Clean up GameFlow and GameScriptLevel by adding default member initialisers. Replace GameScriptFog with GameScriptColor. Rename some enums for consistency. Make TITLE_TYPE and enum for consistency. 2021-07-26 18:23:29 +01:00
hispidence
b0089ef059 Make GetString return a char const *. 
Make Intro a char const *.
 2021-07-23 21:48:49 +01:00
Troye
7b0025a1c9 FLARE_AGE constant; fix dynamic light intensity; fix release builds 2021-07-13 22:29:47 -05:00
MontyTRC89
b544c8bed6 Merge branch 'NewLuaScripting' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting 2021-06-26 07:37:02 +02:00
MontyTRC89
4c7110558f Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
Brad Ellis
1a41e3ef50 Remove Strings and CurrentStrings from GameFlow; they were for the old system. Remove LoadScript for the same reason. 2021-06-25 14:33:26 +01:00
Brad Ellis
1a9347297c Remove assignment that already happens in LuaHandler. 2021-06-23 21:27:04 +01:00
MontyTRC89
3bd65d3629 Removed test code; Removed scripts from project (they will be created by LD); Added some missing strings for inventory; Added scripting for puzzles; Removed some old code for scripting; 2021-06-23 05:58:24 +02:00
MontyTRC89
907fce42e7 Added translations support and fixed some bugs with strings 2021-06-20 06:33:44 +02:00
MontyTRC89
a03f30952c Merge branch 'master' into NewLuaScripting 
# Conflicts:
#	TR5Main/Scripting/GameFlowScript.cpp
#	TR5Main/Scripting/GameFlowScript.h
 2021-06-19 07:20:04 +02:00
MontyTRC89
1bb5965157 Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
Brad Ellis
b6be46992b GameFlowScript changes: 
Remove all code related to reading SCRIPT.DAT.

Include AudioTracks.h, which, I emphasise, is temporary until we start listing audio tracks in Lua.

Hardcode language to English for now.

Add WeatherType and LaraType usertypes. These were in the Lua scripts but weren't connected with their related C++ types.

Name -> NameStringIndex; the latter is what the engine reads, and as far as I can tell, that is what GameFlow.lua is passing.

Add _GameFlow usertype to correspond to the GameFlow class. I don't think this is the perfect way to expose this functionality to Lua, but it will do the job for now.

GameFlow's destructor now deletes its dynamically allocated memory. Note that I haven't fully looked into whether said memory needs to be dynamically allocated; I just new'd GameScriptLevels and LanguageScripts because they were being new'd in the original implementation.
 2021-06-16 15:05:10 +01:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03:00
Nils Gaitzsch
82b3944dde Deactivated Pool memory 
@TODO: Fix Pool
Changed pointers for ChunkIds to smart pointers
 2020-08-11 19:18:36 +02:00
Nils Gaitzsch
c860919616 Fixed std namespace collisions 
Refactored ChunkID/ChunkReader/Writer
 2020-06-20 23:39:08 +02:00