Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ImenuDef_t] Renamed IMenu to ImenuDef_t.

Browse Source
This commit is contained in:
RektInator 2017-02-25 21:01:06 +01:00
parent e1c3ecdf4d
commit dafd117d07
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Components/Modules/AssetHandler.cpp
View File

@ -425,7 +425,6 @@ namespace Components
// Register asset interfaces // Register asset interfaces
if (ZoneBuilder::IsEnabled()) if (ZoneBuilder::IsEnabled())
{ {
AssetHandler::RegisterInterface(new Assets::IMenu());
AssetHandler::RegisterInterface(new Assets::IXModel()); AssetHandler::RegisterInterface(new Assets::IXModel());
AssetHandler::RegisterInterface(new Assets::IFxWorld()); AssetHandler::RegisterInterface(new Assets::IFxWorld());
AssetHandler::RegisterInterface(new Assets::IMapEnts()); AssetHandler::RegisterInterface(new Assets::IMapEnts());
@ -438,6 +437,8 @@ namespace Components
AssetHandler::RegisterInterface(new Assets::ISndCurve()); AssetHandler::RegisterInterface(new Assets::ISndCurve());
AssetHandler::RegisterInterface(new Assets::IMaterial()); AssetHandler::RegisterInterface(new Assets::IMaterial());
AssetHandler::RegisterInterface(new Assets::IMenuList()); AssetHandler::RegisterInterface(new Assets::IMenuList());
AssetHandler::RegisterInterface(new Assets::ImenuDef_t());
#ifdef ENABLE_EXPERIMENTAL_MAP_CODE #ifdef ENABLE_EXPERIMENTAL_MAP_CODE
AssetHandler::RegisterInterface(new Assets::IclipMap_t()); AssetHandler::RegisterInterface(new Assets::IclipMap_t());
#endif #endif

2
src/Components/Modules/AssetHandler.hpp
View File

@ -74,7 +74,6 @@ namespace Components
}; };
} }
#include "AssetInterfaces/IMenu.hpp"
#include "AssetInterfaces/IXModel.hpp" #include "AssetInterfaces/IXModel.hpp"
#include "AssetInterfaces/IFxWorld.hpp" #include "AssetInterfaces/IFxWorld.hpp"
#include "AssetInterfaces/IMapEnts.hpp" #include "AssetInterfaces/IMapEnts.hpp"
@ -85,6 +84,7 @@ namespace Components
#include "AssetInterfaces/IMaterial.hpp" #include "AssetInterfaces/IMaterial.hpp"
#include "AssetInterfaces/ISndCurve.hpp" #include "AssetInterfaces/ISndCurve.hpp"
#include "AssetInterfaces/IMenuList.hpp" #include "AssetInterfaces/IMenuList.hpp"
#include "AssetInterfaces/ImenuDef_t.hpp"
#include "AssetInterfaces/IclipMap_t.hpp" #include "AssetInterfaces/IclipMap_t.hpp"
#include "AssetInterfaces/IPhysPreset.hpp" #include "AssetInterfaces/IPhysPreset.hpp"
#include "AssetInterfaces/IXAnimParts.hpp" #include "AssetInterfaces/IXAnimParts.hpp"

0
src/Components/Modules/AssetInterfaces/IMenu.cpp → src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp
View File

2
src/Components/Modules/AssetInterfaces/IMenu.hpp → src/Components/Modules/AssetInterfaces/ImenuDef_t.hpp
View File

@ -2,7 +2,7 @@
namespace Assets namespace Assets
{ {
class IMenu : public Components::AssetHandler::IAsset class ImenuDef_t : public Components::AssetHandler::IAsset
{ {
public: public:
virtual Game::XAssetType getType() override { return Game::XAssetType::ASSET_TYPE_MENU; }; virtual Game::XAssetType getType() override { return Game::XAssetType::ASSET_TYPE_MENU; };