From 13ef6e54988853039b30c53b8a940afc3f3d2b54 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Mon, 3 Aug 2015 22:26:22 +0200 Subject: [PATCH] Fixed position & direction when copying object from F12 menu --- src/object/level/parserparam.cpp | 3 ++- src/object/robotmain.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/object/level/parserparam.cpp b/src/object/level/parserparam.cpp index 6e097069..b61367f5 100644 --- a/src/object/level/parserparam.cpp +++ b/src/object/level/parserparam.cpp @@ -83,7 +83,8 @@ CLevelParserParam::CLevelParserParam(Math::Point value) CLevelParserParam::CLevelParserParam(Math::Vector value) { m_array.push_back(MakeUnique(value.x)); - m_array.push_back(MakeUnique(value.y)); + if(value.y != 0.0f) + m_array.push_back(MakeUnique(value.y)); m_array.push_back(MakeUnique(value.z)); LoadArray(); diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 18954e0d..fca9c3a4 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -907,8 +907,10 @@ bool CRobotMain::ProcessEvent(Event &event) { CLevelParserLine line("CreateObject"); line.AddParam("type", MakeUnique(obj->GetType())); - line.AddParam("pos", MakeUnique(obj->GetPosition())); - line.AddParam("dir", MakeUnique(obj->GetRotationZ()/(Math::PI/180.0f))); + Math::Vector pos = obj->GetPosition()/g_unit; + pos.y = 0.0f; + line.AddParam("pos", MakeUnique(pos)); + line.AddParam("dir", MakeUnique(obj->GetRotationY())); std::stringstream ss; ss << line;