zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-16 18:03:03 +00:00
Code Activity

refactor: do not nest asset namespaces in game namespaces

Browse Source 
* Duplicated namespace names are kind of annoying
This commit is contained in:
Jan Laupetin
2025-08-06 00:50:35 +02:00
parent 33c09dfe61
commit 46fb919a52
336 changed files with 1430 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ObjLoading/Game/IW4/StringTable/LoaderStringTableIW4.cpp
View File

@@ -6,7 +6,6 @@
#include "StringTable/StringTableLoader.h"
using namespace IW4;
using namespace ::string_table;
namespace
{
@@ -25,7 +24,7 @@ namespace
if (!file.IsOpen())
return AssetCreationResult::NoAction();
StringTableLoaderV2<StringTable, Common::StringTable_HashString> loader;
string_table::StringTableLoaderV2<StringTable, Common::StringTable_HashString> loader;
auto* stringTable = loader.LoadFromStream(assetName, m_memory, *file.m_stream);
if (!stringTable)
return AssetCreationResult::Failure();
@@ -39,10 +38,10 @@ namespace
};
} // namespace
namespace IW4::string_table
namespace string_table
{
std::unique_ptr<AssetCreator<AssetStringTable>> CreateLoader(MemoryManager& memory, ISearchPath& searchPath)
std::unique_ptr<AssetCreator<AssetStringTable>> CreateLoaderIW4(MemoryManager& memory, ISearchPath& searchPath)
{
return std::make_unique<LoaderStringTable>(memory, searchPath);
}
} // namespace IW4::string_table
} // namespace string_table

6
src/ObjLoading/Game/IW4/StringTable/LoaderStringTableIW4.h
View File

@@ -7,7 +7,7 @@
#include <memory>
namespace IW4::string_table
namespace string_table
{
std::unique_ptr<AssetCreator<AssetStringTable>> CreateLoader(MemoryManager& memory, ISearchPath& searchPath);
} // namespace IW4::string_table
std::unique_ptr<AssetCreator<IW4::AssetStringTable>> CreateLoaderIW4(MemoryManager& memory, ISearchPath& searchPath);
} // namespace string_table