actually allow loading v2 and enable in converter
This commit is contained in:
parent
de3b8f059e
commit
a845609660
@ -99,7 +99,7 @@ int main(int argc, const char** argv) {
|
|||||||
// TODO: error handling
|
// TODO: error handling
|
||||||
const auto j = nlohmann::json::parse(tmp_buffer);
|
const auto j = nlohmann::json::parse(tmp_buffer);
|
||||||
|
|
||||||
if (false) {
|
if (true) {
|
||||||
e.e.replace<ObjComp::MessagesVersion>(uint16_t(2));
|
e.e.replace<ObjComp::MessagesVersion>(uint16_t(2));
|
||||||
|
|
||||||
// overwrite og
|
// overwrite og
|
||||||
|
@ -607,7 +607,9 @@ float MessageFragmentStore::tick(float) {
|
|||||||
// missing version, adding
|
// missing version, adding
|
||||||
fh.emplace<ObjComp::MessagesVersion>();
|
fh.emplace<ObjComp::MessagesVersion>();
|
||||||
}
|
}
|
||||||
if (fh.get<ObjComp::MessagesVersion>().v != 1) {
|
const auto object_version = fh.get<ObjComp::MessagesVersion>().v;
|
||||||
|
// TODO: move this early version check somewhere else
|
||||||
|
if (object_version != 1 && object_version != 2) {
|
||||||
std::cerr << "MFS: object with version mismatch\n";
|
std::cerr << "MFS: object with version mismatch\n";
|
||||||
return 0.05f;
|
return 0.05f;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user