mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal

Browse Source
This commit is contained in:
gugus 2011-12-29 17:59:21 +01:00
commit 5cfac197d4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwdialogue/journalentry.cpp
View File

@ -42,7 +42,7 @@ namespace MWDialogue
iter!=dialogue->mInfo.end(); ++iter) iter!=dialogue->mInfo.end(); ++iter)
if (iter->data.disposition==index) /// \todo cleanup info structure if (iter->data.disposition==index) /// \todo cleanup info structure
{ {
iter->id; return iter->id;
} }
throw std::runtime_error ("unknown journal index for topic " + topic); throw std::runtime_error ("unknown journal index for topic " + topic);

2
components/CMakeLists.txt
View File

@ -64,3 +64,5 @@ add_component_dir (interpreter
include_directories(${BULLET_INCLUDE_DIRS}) include_directories(${BULLET_INCLUDE_DIRS})
add_library (components STATIC ${COMPONENT_FILES}) add_library (components STATIC ${COMPONENT_FILES})
target_link_libraries (components ${Boost_LIBRARIES} ${OGRE_LIBRARIES})