diff options
Diffstat (limited to 'src/tools/extractor_common')
| -rw-r--r-- | src/tools/extractor_common/ExtractorDB2LoadInfo.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/tools/extractor_common/ExtractorDB2LoadInfo.h b/src/tools/extractor_common/ExtractorDB2LoadInfo.h index 88d6bf4985e..39bec07c9a0 100644 --- a/src/tools/extractor_common/ExtractorDB2LoadInfo.h +++ b/src/tools/extractor_common/ExtractorDB2LoadInfo.h @@ -35,7 +35,7 @@ struct CinematicCameraLoadInfo { false, FT_INT, "SoundID" }, { false, FT_FLOAT, "OriginFacing" }, { false, FT_INT, "FileDataID" }, - { true, FT_INT, "Unknown915" }, + { false, FT_INT, "ConversationID" }, }; static DB2MetaField const fields[5] = { @@ -43,10 +43,10 @@ struct CinematicCameraLoadInfo { FT_INT, 1, false }, { FT_FLOAT, 1, true }, { FT_INT, 1, false }, - { FT_INT, 1, true }, + { FT_INT, 1, false }, }; - static DB2Meta meta(1294214, -1, 5, 5, 0x3920D07C, fields, -1); - static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::extent<decltype(loadedFields)>::value, &meta); + static DB2Meta meta(1294214, -1, 5, 5, 0x4B3DF171, fields, -1); + static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::size(loadedFields), &meta); return &loadInfo; } }; @@ -78,7 +78,7 @@ struct GameobjectDisplayInfoLoadInfo { FT_FLOAT, 1, true }, }; static DB2Meta meta(1266277, -1, 5, 5, 0x7E33A93F, fields, -1); - static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::extent<decltype(loadedFields)>::value, &meta); + static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::size(loadedFields), &meta); return &loadInfo; } }; @@ -99,7 +99,7 @@ struct LiquidMaterialLoadInfo { FT_BYTE, 1, true }, }; static DB2Meta meta(1132538, -1, 2, 2, 0x2CFFEA40, fields, -1); - static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::extent<decltype(loadedFields)>::value, &meta); + static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::size(loadedFields), &meta); return &loadInfo; } }; @@ -126,7 +126,7 @@ struct LiquidObjectLoadInfo { FT_BYTE, 1, false }, }; static DB2Meta meta(1308058, -1, 5, 5, 0x6CAEB8A1, fields, -1); - static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::extent<decltype(loadedFields)>::value, &meta); + static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::size(loadedFields), &meta); return &loadInfo; } }; @@ -219,7 +219,7 @@ struct LiquidTypeLoadInfo { FT_FLOAT, 4, true }, }; static DB2Meta meta(1371380, -1, 21, 21, 0xAFFFC9E0, fields, -1); - static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::extent<decltype(loadedFields)>::value, &meta); + static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::size(loadedFields), &meta); return &loadInfo; } }; @@ -254,11 +254,12 @@ struct MapLoadInfo { true, FT_SHORT, "WindSettingsID" }, { true, FT_INT, "ZmpFileDataID" }, { true, FT_INT, "WdtFileDataID" }, + { true, FT_INT, "NavigationMaxDistance" }, { true, FT_INT, "Flags1" }, { true, FT_INT, "Flags2" }, { true, FT_INT, "Flags3" }, }; - static DB2MetaField const fields[23] = + static DB2MetaField const fields[24] = { { FT_STRING_NOT_LOCALIZED, 1, true }, { FT_STRING, 1, true }, @@ -282,10 +283,11 @@ struct MapLoadInfo { FT_SHORT, 1, true }, { FT_INT, 1, true }, { FT_INT, 1, true }, + { FT_INT, 1, true }, { FT_INT, 3, true }, }; - static DB2Meta meta(1349477, -1, 23, 23, 0xAAA1F94E, fields, -1); - static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::extent<decltype(loadedFields)>::value, &meta); + static DB2Meta meta(1349477, -1, 24, 24, 0x43E626E4, fields, -1); + static DB2FileLoadInfo const loadInfo(&loadedFields[0], std::size(loadedFields), &meta); return &loadInfo; } }; |