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

Fix merge error

Browse source
This commit is contained in:
Sezz 2023-04-01 17:00:59 +11:00
parent a4de4d4f09
commit 047b265fb7
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TombEngine/Scripting/Internal/TEN/Logic/LogicHandler.cpp
View file

@ -607,15 +607,15 @@ void LogicHandler::GetVariables(std::vector<SavedVar>& vars)
{
if (second.is<Vec3>())
{
putInVars(Handle<SavedVarType::Vec3, Vector3i>(second.as<Vec3>(), varsMap, nVars, vars));
putInVars(Handle<SavedVarType::Vec3, Vector3i>(second.as<Vec3>(), varsMap, numVars, vars));
}
else if (second.is<Rotation>())
{
putInVars(Handle<SavedVarType::Rotation, Vector3>(second.as<Rotation>(), varsMap, nVars, vars));
putInVars(Handle<SavedVarType::Rotation, Vector3>(second.as<Rotation>(), varsMap, numVars, vars));
}
else if (second.is<ScriptColor>())
{
putInVars(Handle<SavedVarType::Color, D3DCOLOR>(second.as<ScriptColor>(), varsMap, nVars, vars));
putInVars(Handle<SavedVarType::Color, D3DCOLOR>(second.as<ScriptColor>(), varsMap, numVars, vars));
}
else if (second.is<LevelFunc>())
{