zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix iw3 gcc compatibility

Browse Source
This commit is contained in:
Jan 2021-04-15 18:35:36 +02:00
parent 1c97c9beee
commit e6a10fb992
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,7 +558,7 @@ namespace IW3
MaterialTextureDefInfo u;
};
struct GfxDrawSurfFields
struct gcc_align(8) GfxDrawSurfFields
{
uint64_t objectId : 16;
uint64_t reflectionProbeIndex : 8;
@ -573,8 +573,8 @@ namespace IW3
union GfxDrawSurf
{
GfxDrawSurfFields fields;
uint64_t packed;
gcc_align(8) GfxDrawSurfFields fields;
gcc_align(8) uint64_t packed;
};
struct MaterialInfo
@ -1355,7 +1355,7 @@ namespace IW3
float angles[3];
};
struct __declspec(align(4)) GfxLightImage
struct type_align(4) GfxLightImage
{
GfxImage* image;
char samplerState;

1
src/ObjLoading/ObjContainer/SoundBank/SoundBank.cpp
View File

@ -3,6 +3,7 @@
#include <sstream>
#include <vector>
#include <memory>
#include <cstring>
#include "zlib.h"