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

Implement FindRoomNumber and use it elsewhere

Browse source
This commit is contained in:
Lwmte 2022-07-05 23:25:42 +03:00
parent cdec61d0ff
commit 82132ae405
9 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -367,12 +367,12 @@ void Moveable::Register(sol::table & parent)
void Moveable::Init()
{
bool cond = IsPointInRoom(m_item->Pose, m_item->RoomNumber);
bool cond = IsPointInRoom(m_item->Pose.Position, m_item->RoomNumber);
std::string err{ "Position of item \"{}\" does not match its room ID." };
if (!ScriptAssertF(cond, err, m_item->LuaName))
{
ScriptWarn("Resetting to the center of the room.");
PHD_3DPOS center = GetRoomCenter(m_item->RoomNumber);
auto center = GetRoomCenter(m_item->RoomNumber);
// reset position but not rotation
m_item->Pose.Position.x = center.Position.x;
m_item->Pose.Position.y = center.Position.y;