From d91569e165083a7c12b1c672713a9725d80c261c Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 11 Jan 2014 17:51:13 +0100 Subject: Showing coordinates in stats menu (F12/showstat); removed "showpos" cheat Issue #277 Conflicts: src/object/cheat.cpp src/object/robotmain.cpp src/object/robotmain.h --- src/object/robotmain.cpp | 20 ++++---------------- src/object/robotmain.h | 1 - 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'src/object') diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index adbe81d..90faceb 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -673,7 +673,6 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile) m_editFull = false; m_hilite = false; m_freePhoto = false; - m_showPos = false; m_selectInsect = false; m_showSoluce = false; @@ -2080,12 +2079,6 @@ void CRobotMain::ExecuteCmd(char *cmd) return; } - if (strcmp(cmd, "showpos") == 0) - { - m_showPos = !m_showPos; - return; - } - if (strcmp(cmd, "selectinsect") == 0) { m_selectInsect = !m_selectInsect; @@ -3369,16 +3362,11 @@ void CRobotMain::AbortMovie() //! Updates the text information void CRobotMain::UpdateInfoText() { - if (m_showPos) + CObject* obj = GetSelect(); + if (obj != nullptr) { - CObject* obj = GetSelect(); - if (obj != nullptr) - { - Math::Vector pos = obj->GetPosition(0); - char info[100]; - sprintf(info, "Pos = %.2f ; %.2f", pos.x/g_unit, pos.z/g_unit); - //TODO: m_engine->SetInfoText(4, info); - } + Math::Vector pos = obj->GetPosition(0); + m_engine->SetStatisticPos(pos); } } diff --git a/src/object/robotmain.h b/src/object/robotmain.h index 2c819cc..da31e5f 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -479,7 +479,6 @@ protected: Gfx::Color m_color; bool m_freePhoto; bool m_cmdEdit; - bool m_showPos; bool m_selectInsect; bool m_showSoluce; bool m_showAll; -- cgit v1.2.3-1-g7c22