From 31ab710485b6a4f8dfb0569e0ba2225cd31d71b5 Mon Sep 17 00:00:00 2001 From: mittorn Date: Sat, 16 Mar 2019 11:27:15 +0700 Subject: [PATCH] Fix sprite loading --- engine/common/mod_sprite.c | 3 --- ref_gl/gl_sprite.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/engine/common/mod_sprite.c b/engine/common/mod_sprite.c index 4f77257e..07364684 100644 --- a/engine/common/mod_sprite.c +++ b/engine/common/mod_sprite.c @@ -34,7 +34,6 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui dsprite_q1_t *pinq1; dsprite_hl_t *pinhl; dsprite_t *pin; - short *numi = NULL; msprite_t *psprite; int i, size; @@ -80,7 +79,6 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui mod->maxs[0] = mod->maxs[1] = pinq1->bounds[0] * 0.5f; mod->mins[2] = -pinq1->bounds[1] * 0.5f; mod->maxs[2] = pinq1->bounds[1] * 0.5f; - numi = NULL; } else if( i == SPRITE_VERSION_HL ) { @@ -100,7 +98,6 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui mod->maxs[0] = mod->maxs[1] = pinhl->bounds[0] * 0.5f; mod->mins[2] = -pinhl->bounds[1] * 0.5f; mod->maxs[2] = pinhl->bounds[1] * 0.5f; - numi = (short *)(pinhl + 1); } if( Host_IsDedicated() ) diff --git a/ref_gl/gl_sprite.c b/ref_gl/gl_sprite.c index fed3361a..854ec676 100644 --- a/ref_gl/gl_sprite.c +++ b/ref_gl/gl_sprite.c @@ -144,13 +144,19 @@ load sprite model */ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, uint texFlags ) { - dsprite_q1_t *pinq1; - dsprite_hl_t *pinhl; dsprite_t *pin; short *numi = NULL; dframetype_t *pframetype; msprite_t *psprite; - int i, size; + int i; + + pin = buffer; + psprite = mod->cache.data; + + if( pin->version == SPRITE_VERSION_Q1 || pin->version == SPRITE_VERSION_32 ) + numi = NULL; + else if( pin->version == SPRITE_VERSION_HL ) + numi = (short *)(buffer + sizeof( dsprite_hl_t )); r_texFlags = texFlags; sprite_version = pin->version;