zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-25 13:51:58 +00:00
Code Activity

Merge pull request #458 from Laupetin/fix/x86-ff-loading

Browse Source 
fix: x86 ff loading broken due to x64 updates
This commit is contained in:
Jan
2025-06-22 23:05:10 +02:00
committed by GitHub
parent f5a823dc9e dd9b0915d9
commit def9da6ae5
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Game/IW3/IW3_Assets.h
View File

@ -257,7 +257,7 @@ namespace IW3
struct type_align(4) XQuat struct type_align(4) XQuat
{ {
int16_t value[4]; int16_t value[2];
}; };
union XAnimDynamicIndicesQuat union XAnimDynamicIndicesQuat

2
src/Common/Game/T5/T5_Assets.h
View File

@ -387,7 +387,7 @@ namespace T5
struct type_align(4) XQuat struct type_align(4) XQuat
{ {
int16_t value[4]; int16_t value[2];
}; };
union XAnimDynamicIndicesQuat union XAnimDynamicIndicesQuat

2
src/ZoneLoading/Game/IW3/ZoneLoaderFactoryIW3.cpp
View File

@ -86,7 +86,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
// Start of the zone content // Start of the zone content
zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent( zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
[&zonePtr](ZoneInputStream& stream) [zonePtr](ZoneInputStream& stream)
{ {
return std::make_unique<ContentLoader>(*zonePtr, stream); return std::make_unique<ContentLoader>(*zonePtr, stream);
}, },

2
src/ZoneLoading/Game/IW5/ZoneLoaderFactoryIW5.cpp
View File

@ -185,7 +185,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
// Start of the zone content // Start of the zone content
zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent( zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
[&zonePtr](ZoneInputStream& stream) [zonePtr](ZoneInputStream& stream)
{ {
return std::make_unique<ContentLoader>(*zonePtr, stream); return std::make_unique<ContentLoader>(*zonePtr, stream);
}, },

2
src/ZoneLoading/Game/T5/ZoneLoaderFactoryT5.cpp
View File

@ -86,7 +86,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
// Start of the zone content // Start of the zone content
zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent( zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
[&zonePtr](ZoneInputStream& stream) [zonePtr](ZoneInputStream& stream)
{ {
return std::make_unique<ContentLoader>(*zonePtr, stream); return std::make_unique<ContentLoader>(*zonePtr, stream);
}, },

2
src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
View File

@ -204,7 +204,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
// Start of the zone content // Start of the zone content
zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent( zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
[&zonePtr](ZoneInputStream& stream) [zonePtr](ZoneInputStream& stream)
{ {
return std::make_unique<ContentLoader>(*zonePtr, stream); return std::make_unique<ContentLoader>(*zonePtr, stream);
}, },