Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Asset Unknown Multiple Definitions #2274

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommandLine/libEGM/egm-read.cpp
Expand Up @@ -469,7 +469,7 @@ bool EGMFileFormat::LoadTree(const fs::path& fPath, YAML::Node yaml,

LoadResource(fPath.string() + "/" + name + factory->second.ext, factory->second.func(b), id);
} else {
buffer->mutable_unknown();
buffer->mutable_unknown_resource();
errStream << "Warning: Unsupported resource type: " << n["type"] << std::endl;
}
}
Expand Down
2 changes: 1 addition & 1 deletion CommandLine/libEGM/gmk.cpp
Expand Up @@ -1224,7 +1224,7 @@ void LoadTree(Decoder &dec, TypeMap &typeMap, TreeNode* root) {

auto typeMapIt = typeMap.find(type);
if (typeMapIt == typeMap.end()) {
node->mutable_unknown();
node->mutable_unknown_resource();
errStream << "No map of ids to protocol buffers for GMK kind '" << kind
<< "' so tree node with name '" << name << "' will not have "
<< "its protocol buffer set" << std::endl;
Expand Down
2 changes: 1 addition & 1 deletion CommandLine/libEGM/gmx.cpp
Expand Up @@ -124,7 +124,7 @@ class gmx_root_walker {
}
return;
}
node->mutable_unknown();
node->mutable_unknown_resource();
errStream << "Unsupported resource type: " << resType << " " << xmlNode.value() << std::endl;
}

Expand Down
2 changes: 1 addition & 1 deletion CommandLine/libEGM/yyp.cpp
Expand Up @@ -294,7 +294,7 @@ std::unique_ptr<buffers::Project> YYPFileFormat::LoadProject(const fs::path& fPa
auto *res = createFunc->second(node);
PackRes(resDir, idCount[node->type_case()]++, nodeDoc, res, 0);
} else {
node->mutable_unknown();
node->mutable_unknown_resource();
errStream << "Unsupported resource type: " << resourceType << " " << node->name() << std::endl;
}
}
Expand Down
2 changes: 1 addition & 1 deletion shared/protos/treenode.proto
Expand Up @@ -21,7 +21,7 @@ message TreeNode {
message UnknownResource {
}
oneof type {
UnknownResource unknown = 999;
UnknownResource unknown_resource = 999;
Folder folder = 100;
// NOTE: these are all off by 1 cause protobutt don't allow you to set field number to 0
resources.Object object = 1;
Expand Down