RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-07 04:40:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: operate on a local copy of dspriteframe_t to avoid unaligned access on ARMv7

Browse Source
This commit is contained in:
Alibek Omarov
2026-05-07 11:56:08 +05:00
parent e6a44b70e0
commit c2df265de7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
engine/common/mod_sprite.c
View File

@@ -51,20 +51,23 @@ le_struct_end();
static byte *Mod_SwapSpriteFrame( byte *p, byte *end, int bytes )
{
dspriteframe_t *frame;
dspriteframe_t frame;
if( p + sizeof( *frame ) > end )
if( p + sizeof( frame ) > end )
return NULL;
frame = (dspriteframe_t *)p;
le_struct_swap( dspriteframe_swap, frame );
p += sizeof( *frame );
memcpy( &frame, p, sizeof( frame ));
le_struct_swap( dspriteframe_swap, &frame );
#if XASH_BIG_ENDIAN
memcpy( p, &frame, sizeof( frame ));
#endif
p += sizeof( frame );
// skip pixel data
if( p + frame->width * frame->height * bytes > end )
if( p + frame.width * frame.height * bytes > end )
return NULL;
p += frame->width * frame->height * bytes;
p += frame.width * frame.height * bytes;
return p;
}

3
engine/common/mod_studio.c
View File

@@ -1009,9 +1009,6 @@ static qboolean Mod_SwapStudioModel( const char *name, void *buffer, size_t buff
if( phdr->ident != IDSTUDIOHEADER || phdr->version != STUDIO_VERSION )
return false;
#if XASH_BIG_ENDIAN
if( phdr->studiohdr2index > 0 && phdr->studiohdr2index < phdr->length )
{