Skip to content

Commit 164bbdc

Browse files
author
Xav101
committed
engine: incorporate code formatting suggestions from PR
1 parent 4753425 commit 164bbdc

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

engine/common/mod_bmodel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ static void Mod_LoadVertexes( dbspmodel_t *bmod )
19161916
{
19171917
if( bmod->isworld )
19181918
AddPointToBounds( in->point, world.mins, world.maxs );
1919-
#ifdef XASH_BIG_ENDIAN
1919+
#if XASH_BIG_ENDIAN
19201920
for( int j = 0; j < 3; j++ )
19211921
{
19221922

@@ -2903,10 +2903,10 @@ Mod_LoadBSPHeader
29032903
29042904
=================
29052905
*/
2906-
_inline dheader_t* Mod_LoadBSPHeader( const byte *mod_base )
2906+
static inline dheader_t* Mod_LoadBSPHeader( const byte *mod_base )
29072907
{
29082908
dheader_t *header = (dheader_t *)mod_base;
2909-
#ifdef XASH_BIG_ENDIAN
2909+
#if XASH_BIG_ENDIAN
29102910
LittleLongSW( header->version );
29112911
for( int i = 0; i < HEADER_LUMPS; i++ )
29122912
{

engine/common/model.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash )
256256
qboolean loaded;
257257
byte *buf;
258258
model_info_t *p;
259+
uint32_t version;
259260

260261
ASSERT( mod != NULL );
261262

@@ -290,7 +291,8 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash )
290291
loadmodel = mod;
291292

292293
// call the apropriate loader
293-
switch( *(uint *)buf )
294+
version = LittleLong( *(uint *)buf );
295+
switch( version )
294296
{
295297
case IDSTUDIOHEADER:
296298
Mod_LoadStudioModel( mod, buf, &loaded );
@@ -303,7 +305,7 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash )
303305
loaded = true;
304306
break;
305307
case Q1BSP_VERSION:
306-
case LittleLong(HLBSP_VERSION):
308+
case HLBSP_VERSION:
307309
case QBSP2_VERSION:
308310
Mod_LoadBrushModel( mod, buf, &loaded );
309311
// ref.dllFuncs.Mod_LoadModel( mod_brush, mod, buf, &loaded, 0 );

filesystem/wad.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,9 @@ static wfile_t *W_Open( const char *filename, int *error )
337337
return NULL;
338338
}
339339

340-
LittleLongSW(header.ident);
341-
LittleLongSW(header.numlumps);
342-
LittleLongSW(header.infotableofs);
340+
LittleLongSW( header.ident );
341+
LittleLongSW( header.numlumps );
342+
LittleLongSW( header.infotableofs );
343343

344344
if( header.ident != IDWAD2HEADER && header.ident != IDWAD3HEADER )
345345
{

public/xash3d_mathlib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ GNU General Public License for more details.
8080
#define Q_round( x, y ) (floor( x / y + 0.5f ) * y )
8181
#define Q_rint(x) ((x) < 0.0f ? ((int)((x)-0.5f)) : ((int)((x)+0.5f)))
8282

83-
#if defined( XASH_IRIX ) && defined( __GNUC__ )
83+
#if XASH_IRIX && __GNUC__
8484
#undef isnan
8585
#define isnan __builtin_isnan
8686
#endif

0 commit comments

Comments
 (0)