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

fixed commit

Browse source
This commit is contained in:
Nemoel-Tomo 2022-11-29 17:00:16 +01:00
parent 9c33d66347
commit ab64f466ff
11 changed files with 34 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.cpp
View file

@ -703,15 +703,19 @@ void Moveable::SetEffect(EffectType effectType, sol::optional<float> timeout)
void Moveable::SetCustomEffect(EffectType effectType, const ScriptColor& col1, const ScriptColor& col2, sol::optional<float> timeout)
{
int realTimeout = timeout.has_value() ? int(timeout.value() * FPS) : -1;
Vector3 color1 = Vector3(col1.GetR() * (1.f / 255.f), col1.GetG() * (1.f / 255.f), col1.GetB() * (1.f / 255.f));
Vector3 color2 = Vector3(col2.GetR() * (1.f / 255.f), col2.GetG() * (1.f / 255.f), col2.GetB() * (1.f / 255.f));
switch (effectType)
{
case EffectType::MagicFire:
ItemMagicBurn(m_item, col1, col2, realTimeout);
m_item->Effect.Type = EffectType::MagicFire;
ItemColorBurn(m_item, color1, color2, realTimeout);
break;
case EffectType::ColoredFire:
ItemColorBurn(m_item, col1, col2, realTimeout);
m_item->Effect.Type = EffectType::ColoredFire;
ItemColorBurn(m_item, color1, color2, realTimeout);
break;
}
}