Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #1499

Browse source
This commit is contained in:
Lwmte 2024-12-02 02:56:09 +01:00
parent dbaaf9fd5e
commit 9642118cfa
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -53,6 +53,7 @@ TombEngine releases are located in this repository (alongside with Tomb Editor):
* Added extra argument for SetAmbientTrack() function to specify if new ambient track should play from the beginning. * Added extra argument for SetAmbientTrack() function to specify if new ambient track should play from the beginning.
* Use load camera instead of load screen by playing fixed camera from OnEnd() event and removing loadScreenFile field from level's gameflow entry. * Use load camera instead of load screen by playing fixed camera from OnEnd() event and removing loadScreenFile field from level's gameflow entry.
* Fixed DisplayString class not supporting some Unicode characters and empty lines in multiline strings. * Fixed DisplayString class not supporting some Unicode characters and empty lines in multiline strings.
* Fixed DisplayString not being deallocated after showing.
* Fixed incorrect behaviour of Moveable:GetJointRotation() function. * Fixed incorrect behaviour of Moveable:GetJointRotation() function.
* Fixed incorrect behaviour of Logic.EnableEvent() and Logic.DisableEvent() functions. * Fixed incorrect behaviour of Logic.EnableEvent() and Logic.DisableEvent() functions.
* Fixed Util.HasLineOfSight() not taking static meshes into consideration. * Fixed Util.HasLineOfSight() not taking static meshes into consideration.

4
TombEngine/Scripting/Internal/TEN/Strings/StringsHandler.cpp
View file

@ -30,7 +30,7 @@ Default: nil (i.e. infinite)
@tparam bool autoDelete should be string automatically deleted after timeout is reached. @tparam bool autoDelete should be string automatically deleted after timeout is reached.
If not given, the string will remain allocated even after timeout is reached, and can be If not given, the string will remain allocated even after timeout is reached, and can be
shown again without re-initialization. shown again without re-initialization.
Default: false Default: true
*/ */
table.set_function(ScriptReserved_ShowString, &StringsHandler::ShowString, this); table.set_function(ScriptReserved_ShowString, &StringsHandler::ShowString, this);
@ -93,7 +93,7 @@ void StringsHandler::ShowString(const DisplayString& str, sol::optional<float> n
auto it = m_userDisplayStrings.find(str.GetID()); auto it = m_userDisplayStrings.find(str.GetID());
it->second._timeRemaining = numSeconds.value_or(0.0f); it->second._timeRemaining = numSeconds.value_or(0.0f);
it->second._isInfinite = !numSeconds.has_value(); it->second._isInfinite = !numSeconds.has_value();
it->second._deleteWhenZero = autoDelete.value_or(false); it->second._deleteWhenZero = autoDelete.value_or(true);
} }
bool StringsHandler::IsStringDisplaying(const DisplayString& displayString) bool StringsHandler::IsStringDisplaying(const DisplayString& displayString)