From 022f0fd5bd5749993c732b1fea3fe9a09cc068e3 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Mon, 26 Dec 2011 22:28:53 +0100 Subject: [PATCH 1/2] link order fix for components --- components/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 76e68dd89..75b8aff8c 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -64,3 +64,5 @@ add_component_dir (interpreter include_directories(${BULLET_INCLUDE_DIRS}) add_library (components STATIC ${COMPONENT_FILES}) + +target_link_libraries (components ${Boost_LIBRARIES} ${OGRE_LIBRARIES}) From 33f8049a3660e933756b397b3d715fd77afe5fc4 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Thu, 29 Dec 2011 17:32:57 +0100 Subject: [PATCH 2/2] accessing topic index didn't work --- apps/openmw/mwdialogue/journalentry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp index 5e9dfa674..4eb6b8001 100644 --- a/apps/openmw/mwdialogue/journalentry.cpp +++ b/apps/openmw/mwdialogue/journalentry.cpp @@ -42,7 +42,7 @@ namespace MWDialogue iter!=dialogue->mInfo.end(); ++iter) if (iter->data.disposition==index) /// \todo cleanup info structure { - iter->id; + return iter->id; } throw std::runtime_error ("unknown journal index for topic " + topic);