Index: binaries/data/mods/public/gui/credits/texts/programming.json =================================================================== --- binaries/data/mods/public/gui/credits/texts/programming.json +++ binaries/data/mods/public/gui/credits/texts/programming.json @@ -67,6 +67,7 @@ {"nick": "Dietger", "name": "Dietger van Antwerpen"}, {"nick": "dp304"}, {"nick": "dpiquet", "name": "Damien Piquet"}, + {"nick": "drummyfish", "name": "Miloslav Číž"}, {"nick": "dumbo"}, {"nick": "Dunedan", "name": "Daniel Roschka"}, {"nick": "dvangennip", "name": "Doménique"}, Index: source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp =================================================================== --- source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp +++ source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp @@ -613,6 +613,7 @@ // (button label; tooltip text; image; internal tool name; section to switch to) toolbar->AddToolButton(_("Default"), _("Default"), _T("default.png"), _T(""), _T("")); toolbar->AddToolButton(_("Move"), _("Move/rotate object"), _T("moveobject.png"), _T("TransformObject"), _T("")/*_T("ObjectSidebar")*/); + toolbar->AddToolButton(_("Place"), _("Place object"), _T("default.png"), _T("PlaceObject"), _T("")/*_T("ObjectSidebar")*/); toolbar->AddToolButton(_("Elevation"), _("Alter terrain elevation"), _T("alterelevation.png"), _T("AlterElevation"), _T("")/*_T("TerrainSidebar")*/); toolbar->AddToolButton(_("Smooth"), _("Smooth terrain elevation"), _T("smoothelevation.png"), _T("SmoothElevation"), _T("")/*_T("TerrainSidebar")*/); toolbar->AddToolButton(_("Flatten"), _("Flatten terrain elevation"), _T("flattenelevation.png"), _T("FlattenElevation"), _T("")/*_T("TerrainSidebar")*/); Index: source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp =================================================================== --- source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp +++ source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp @@ -287,6 +287,7 @@ EVT_TEXT(ID_ObjectFilter, ObjectSidebar::OnSelectFilter) EVT_LISTBOX(ID_SelectObject, ObjectSidebar::OnSelectObject) EVT_BUTTON(ID_ToggleViewer, ObjectSidebar::OnToggleViewer) + EVT_LISTBOX_DCLICK(ID_SelectObject, ObjectSidebar::OnSelectObject) END_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// Index: source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp =================================================================== --- source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp +++ source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp @@ -27,6 +27,7 @@ using AtlasMessage::Position; static float g_DefaultAngle = (float)(M_PI*3.0/4.0); +static wxString g_LastObjectID = ""; class PlaceObject : public StateDrivenTool { @@ -34,6 +35,7 @@ Position m_ScreenPos, m_ObjPos, m_Target; wxString m_ObjectID; + unsigned int m_ActorSeed; public: @@ -61,9 +63,9 @@ { StateDrivenTool::Init(initData, scenarioEditor); - wxASSERT(initData); - wxString& id = *static_cast(initData); + wxString& id = initData ? *static_cast(initData) : g_LastObjectID; m_ObjectID = id; + g_LastObjectID = m_ObjectID; SendObjectMsg(true); }