Compare commits

..

2 Commits

Author SHA1 Message Date
Andrey Akhmichin
520fc33394 utils: mdldec: fix wrong conditions. 2023-12-28 20:36:39 +03:00
Alibek Omarov
f705a7cd26 common: xash3d_types: another attempt to properly check static asserts availability 2023-12-28 17:32:07 +03:00
2 changed files with 10 additions and 5 deletions

View File

@@ -121,10 +121,15 @@ typedef uint64_t longtime_t;
#define likely(x) (x) #define likely(x) (x)
#endif #endif
#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L // C11 static_assert #if __STDC_VERSION >= 202311L || __cplusplus >= 201103L // C23 or C++ static_assert is a keyword
#define STATIC_ASSERT static_assert #define STATIC_ASSERT_ static_assert
#define STATIC_ASSERT static_assert
#elif __STDC_VERSION >= 201112L // in C11 it's _Static_assert
#define STATIC_ASSERT_ _Static_assert
#define STATIC_ASSERT _Static_assert
#else #else
#define STATIC_ASSERT( x, y ) extern int _static_assert_##__LINE__[( x ) ? 1 : -1] #define STATIC_ASSERT_( id, x, y ) extern int id[( x ) ? 1 : -1]
#define STATIC_ASSERT( x, y ) STATIC_ASSERT_( static_assert_##__LINE__, x, y )
#endif #endif
#ifdef XASH_BIG_ENDIAN #ifdef XASH_BIG_ENDIAN

View File

@@ -385,7 +385,7 @@ static qboolean LoadMDL( const char *modelname )
} }
} }
if( filesize < sizeof( studiohdr_t ) || filesize != model_hdr->length ) if( filesize < sizeof( studiohdr_t ) || filesize != texture_hdr->length )
{ {
fprintf( stderr, "ERROR: Wrong file size! File %s may be corrupted!\n", texturename ); fprintf( stderr, "ERROR: Wrong file size! File %s may be corrupted!\n", texturename );
return false; return false;
@@ -427,7 +427,7 @@ static qboolean LoadMDL( const char *modelname )
return false; return false;
} }
if( filesize < sizeof( studiohdr_t ) || filesize != model_hdr->length ) if( filesize < sizeof( studiohdr_t ) || filesize != anim_hdr[i]->length )
{ {
fprintf( stderr, "ERROR: Wrong file size! File %s may be corrupted!\n", seqgroupname ); fprintf( stderr, "ERROR: Wrong file size! File %s may be corrupted!\n", seqgroupname );
return false; return false;