From 07c3a57d8ea2e9ecb5c0a98f99939d931e9f91d6 Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 2 Apr 2005 16:20:34 +0000 Subject: [PATCH] fixed hl sprite additive mode git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5139 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_main.c | 3 +-- model_sprite.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cl_main.c b/cl_main.c index 94f52fe8..c95107d5 100644 --- a/cl_main.c +++ b/cl_main.c @@ -613,8 +613,7 @@ void CL_LinkNetworkEntity(entity_t *e) origin[2] += (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value; } // transfer certain model flags to effects - if (e->render.model->flags2 & EF_FULLBRIGHT) - e->render.effects |= EF_FULLBRIGHT; + e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE); if (cl_prydoncursor.integer && (e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e - cl_entities) VectorScale(e->render.colormod, 2, e->render.colormod); } diff --git a/model_sprite.c b/model_sprite.c index 1d824c18..351db53b 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -55,7 +55,6 @@ static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d\n", loadmodel->numframes); loadmodel->type = mod_sprite; - loadmodel->flags2 = EF_FULLBRIGHT; // LordHavoc: hack to allow sprites to be non-fullbright for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++) @@ -221,6 +220,8 @@ void Mod_IDSP_Load(model_t *mod, void *buffer) datapointer = buffer; + loadmodel->flags2 = EF_FULLBRIGHT; + loadmodel->DrawSky = NULL; loadmodel->Draw = R_Model_Sprite_Draw; loadmodel->DrawShadowVolume = NULL; -- 2.39.2