|
|
@ -144,9 +144,9 @@ load sprite model |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, uint texFlags ) |
|
|
|
void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, uint texFlags ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
dsprite_t *pin; |
|
|
|
const dsprite_t *pin; |
|
|
|
short *numi = NULL; |
|
|
|
const short *numi = NULL; |
|
|
|
dframetype_t *pframetype; |
|
|
|
const dframetype_t *pframetype; |
|
|
|
msprite_t *psprite; |
|
|
|
msprite_t *psprite; |
|
|
|
int i; |
|
|
|
int i; |
|
|
|
|
|
|
|
|
|
|
@ -156,7 +156,7 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui |
|
|
|
if( pin->version == SPRITE_VERSION_Q1 || pin->version == SPRITE_VERSION_32 ) |
|
|
|
if( pin->version == SPRITE_VERSION_Q1 || pin->version == SPRITE_VERSION_32 ) |
|
|
|
numi = NULL; |
|
|
|
numi = NULL; |
|
|
|
else if( pin->version == SPRITE_VERSION_HL ) |
|
|
|
else if( pin->version == SPRITE_VERSION_HL ) |
|
|
|
numi = (short *)(buffer + sizeof( dsprite_hl_t )); |
|
|
|
numi = (const short *)((const byte*)buffer + sizeof( dsprite_hl_t )); |
|
|
|
|
|
|
|
|
|
|
|
r_texFlags = texFlags; |
|
|
|
r_texFlags = texFlags; |
|
|
|
sprite_version = pin->version; |
|
|
|
sprite_version = pin->version; |
|
|
@ -168,12 +168,12 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui |
|
|
|
rgbdata_t *pal; |
|
|
|
rgbdata_t *pal; |
|
|
|
|
|
|
|
|
|
|
|
pal = gEngfuncs.FS_LoadImage( "#id.pal", (byte *)&i, 768 ); |
|
|
|
pal = gEngfuncs.FS_LoadImage( "#id.pal", (byte *)&i, 768 ); |
|
|
|
pframetype = (dframetype_t *)(buffer + sizeof( dsprite_q1_t )); // pinq1 + 1
|
|
|
|
pframetype = (const dframetype_t *)((const byte*)buffer + sizeof( dsprite_q1_t )); // pinq1 + 1
|
|
|
|
gEngfuncs.FS_FreeImage( pal ); // palette installed, no reason to keep this data
|
|
|
|
gEngfuncs.FS_FreeImage( pal ); // palette installed, no reason to keep this data
|
|
|
|
} |
|
|
|
} |
|
|
|
else if( *numi == 256 ) |
|
|
|
else if( *numi == 256 ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
byte *src = (byte *)(numi+1); |
|
|
|
const byte *src = (const byte *)(numi+1); |
|
|
|
rgbdata_t *pal; |
|
|
|
rgbdata_t *pal; |
|
|
|
|
|
|
|
|
|
|
|
// install palette
|
|
|
|
// install palette
|
|
|
@ -190,7 +190,7 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
pframetype = (dframetype_t *)(src + 768); |
|
|
|
pframetype = (const dframetype_t *)(src + 768); |
|
|
|
gEngfuncs.FS_FreeImage( pal ); // palette installed, no reason to keep this data
|
|
|
|
gEngfuncs.FS_FreeImage( pal ); // palette installed, no reason to keep this data
|
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|