diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 319c42bbd..a00d764b0 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -194,6 +194,12 @@ void OMW::Engine::addResourcesDirectory (const boost::filesystem::path& path) Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true); } +void OMW::Engine::addZipResource (const boost::filesystem::path& path) +{ + mOgre->getRoot()->addResourceLocation (path.string(), "Zip", + Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, false); +} + void OMW::Engine::enableFSStrict(bool fsStrict) { mFSStrict = fsStrict; @@ -314,6 +320,7 @@ void OMW::Engine::go() addResourcesDirectory(mResDir / "water"); addResourcesDirectory(mResDir / "gbuffer"); addResourcesDirectory(mResDir / "shadows"); + addZipResource(mResDir / "mygui" / "Obliviontt.zip"); // Create the window mOgre->createWindow("OpenMW"); diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp index 63464a40d..cf1ef3b9c 100644 --- a/apps/openmw/engine.hpp +++ b/apps/openmw/engine.hpp @@ -91,9 +91,11 @@ namespace OMW /// add resources directory /// \note This function works recursively. - void addResourcesDirectory (const boost::filesystem::path& path); + /// add a .zip resource + void addZipResource (const boost::filesystem::path& path); + /// Load all BSA files in data directory. void loadBSA(); diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt index d7e86ecff..ac803646e 100644 --- a/files/mygui/CMakeLists.txt +++ b/files/mygui/CMakeLists.txt @@ -58,6 +58,5 @@ configure_file("${SDIR}/atlas1.cfg" "${DDIR}/atlas1.cfg" COPYONLY) configure_file("${SDIR}/smallbars.png" "${DDIR}/smallbars.png" COPYONLY) configure_file("${SDIR}/transparent.png" "${DDIR}/transparent.png" COPYONLY) configure_file("${SDIR}/EBGaramond-Regular.ttf" "${DDIR}/EBGaramond-Regular.ttf" COPYONLY) -configure_file("${SDIR}/Oblivion Worn.ttf" "${DDIR}/Oblivion Worn.ttf" COPYONLY) -configure_file("${SDIR}/Oblivion.ttf" "${DDIR}/Oblivion.ttf" COPYONLY) +configure_file("${SDIR}/Obliviontt.zip" "${DDIR}/Obliviontt.zip" COPYONLY) configure_file("${SDIR}/VeraMono.ttf" "${DDIR}/VeraMono.ttf" COPYONLY) diff --git a/files/mygui/Oblivion Worn.ttf b/files/mygui/Oblivion Worn.ttf deleted file mode 100644 index d48f19ebd..000000000 Binary files a/files/mygui/Oblivion Worn.ttf and /dev/null differ diff --git a/files/mygui/Oblivion.ttf b/files/mygui/Oblivion.ttf deleted file mode 100644 index ab7e85e74..000000000 Binary files a/files/mygui/Oblivion.ttf and /dev/null differ diff --git a/files/mygui/Obliviontt.zip b/files/mygui/Obliviontt.zip new file mode 100644 index 000000000..af4f809fd Binary files /dev/null and b/files/mygui/Obliviontt.zip differ diff --git a/files/mygui/openmw.font.xml b/files/mygui/openmw.font.xml index e93c9b770..252499a5f 100644 --- a/files/mygui/openmw.font.xml +++ b/files/mygui/openmw.font.xml @@ -20,8 +20,8 @@ - - + +