Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 08:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove ResetHub; as it's almost certainly going to be made obsolete with the new scripts and save game rework.

Browse source
This commit is contained in:
hispidence 2021-08-09 00:07:08 +01:00
parent 25e92b6dbd
commit 9df901ec1f
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TR5Main/Scripting/GameScriptLevel.cpp
View file

@ -86,15 +86,13 @@ e.g. `myLevel.laraType = LaraType.DIVESUIT`
@mem laraType*/ @mem laraType*/
"laraType", &GameScriptLevel::LaraType, "laraType", &GameScriptLevel::LaraType,
/// (bool) todo /// (bool) If true, an occasional screen shake effect (as seen in TRC's Sinking Submarine) will
// happen throughout the level.
//@mem rumble //@mem rumble
"rumble", &GameScriptLevel::Rumble, "rumble", &GameScriptLevel::Rumble,
/// (bool) todo /// (Mirror) object holding the location and size of the room's mirror, if present.
//@mem resetHub // __(not yet implemented)__
"resetHub", &GameScriptLevel::ResetHub,
/// (Mirror) todo
//@mem mirror //@mem mirror
"mirror", &GameScriptLevel::Mirror, "mirror", &GameScriptLevel::Mirror,

1
TR5Main/Scripting/GameScriptLevel.h
View file

@ -53,7 +53,6 @@ struct GameScriptLevel
GameScriptColor Fog{ 0, 0, 0 }; GameScriptColor Fog{ 0, 0, 0 };
bool Storm{ false }; bool Storm{ false };
WEATHER_TYPE Weather{ WEATHER_TYPE::NORMAL }; WEATHER_TYPE Weather{ WEATHER_TYPE::NORMAL };
bool ResetHub{ false };
bool Rumble{ false }; bool Rumble{ false };
LARA_TYPE LaraType{ LARA_TYPE::NORMAL }; LARA_TYPE LaraType{ LARA_TYPE::NORMAL };
GameScriptMirror Mirror; GameScriptMirror Mirror;

2
TR5Main/Specific/level.cpp
View file

@ -1073,7 +1073,7 @@ unsigned CALLBACK LoadLevel(void* data)
Wibble = 0; Wibble = 0;
TorchRoom = -1; TorchRoom = -1;
InitialiseGameFlags(); InitialiseGameFlags();
InitialiseLara(!(InitialiseGame || CurrentLevel == 1 || level->ResetHub)); InitialiseLara(!(InitialiseGame || CurrentLevel == 1));
GetCarriedItems(); GetCarriedItems();
GetAIPickups(); GetAIPickups();
Lara.Vehicle = -1; Lara.Vehicle = -1;