teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

removed unused OmwLoader

Browse source
This commit is contained in:
Marc Zinnschlag 2014-09-14 11:28:28 +02:00
parent 081588f484
commit 89000f6196
4 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/CMakeLists.txt
View file

@ -65,7 +65,7 @@ add_openmw_dir (mwworld
cells localscripts customdata weather inventorystore ptr actionopen actionread cells localscripts customdata weather inventorystore ptr actionopen actionread
actionequip timestamp actionalchemy cellstore actionapply actioneat actionequip timestamp actionalchemy cellstore actionapply actioneat
esmstore store recordcmp fallback actionrepair actionsoulgem livecellref actiondoor esmstore store recordcmp fallback actionrepair actionsoulgem livecellref actiondoor
contentloader esmloader omwloader actiontrap cellreflist projectilemanager cellref contentloader esmloader actiontrap cellreflist projectilemanager cellref
) )
add_openmw_dir (mwclass add_openmw_dir (mwclass
@ -110,7 +110,7 @@ if (NOT ANDROID)
${APPLE_BUNDLE_RESOURCES} ${APPLE_BUNDLE_RESOURCES}
) )
else () else ()
add_library(openmw add_library(openmw
SHARED SHARED
${OPENMW_LIBS} ${OPENMW_LIBS_HEADER} ${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
${OPENMW_FILES} ${OPENMW_FILES}
@ -140,18 +140,18 @@ target_link_libraries(openmw
if (ANDROID) if (ANDROID)
target_link_libraries(openmw target_link_libraries(openmw
${OGRE_STATIC_PLUGINS} ${OGRE_STATIC_PLUGINS}
EGL EGL
android android
log log
dl dl
MyGUI.OgrePlatform MyGUI.OgrePlatform
MyGUIEngineStatic MyGUIEngineStatic
Plugin_StrangeButtonStatic Plugin_StrangeButtonStatic
cpufeatures cpufeatures
BulletCollision BulletCollision
BulletDynamics BulletDynamics
LinearMath LinearMath
) )
endif (ANDROID) endif (ANDROID)

17
apps/openmw/mwworld/omwloader.cpp
View file

@ -1,17 +0,0 @@
#include "omwloader.hpp"
namespace MWWorld
{
OmwLoader::OmwLoader(Loading::Listener& listener)
: ContentLoader(listener)
{
}
void OmwLoader::load(const boost::filesystem::path& filepath, int& index)
{
ContentLoader::load(filepath.filename(), index);
}
} /* namespace MWWorld */

21
apps/openmw/mwworld/omwloader.hpp
View file

@ -1,21 +0,0 @@
#ifndef OMWLOADER_HPP
#define OMWLOADER_HPP
#include "contentloader.hpp"
namespace MWWorld
{
/**
* @brief Placeholder for real OpenMW content loader
*/
struct OmwLoader : public ContentLoader
{
OmwLoader(Loading::Listener& listener);
void load(const boost::filesystem::path& filepath, int& index);
};
} /* namespace MWWorld */
#endif /* OMWLOADER_HPP */

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -51,7 +51,6 @@
#include "contentloader.hpp" #include "contentloader.hpp"
#include "esmloader.hpp" #include "esmloader.hpp"
#include "omwloader.hpp"
using namespace Ogre; using namespace Ogre;
@ -170,7 +169,6 @@ namespace MWWorld
GameContentLoader gameContentLoader(*listener); GameContentLoader gameContentLoader(*listener);
EsmLoader esmLoader(mStore, mEsm, encoder, *listener); EsmLoader esmLoader(mStore, mEsm, encoder, *listener);
OmwLoader omwLoader(*listener);
gameContentLoader.addLoader(".esm", &esmLoader); gameContentLoader.addLoader(".esm", &esmLoader);
gameContentLoader.addLoader(".esp", &esmLoader); gameContentLoader.addLoader(".esp", &esmLoader);