Skip to content

Commit

Permalink
Remove special_color_flag = 2, this also fixes the sudden color jump …
Browse files Browse the repository at this point in the history 
…for the Incinerate spell effect
  • Loading branch information
@Eli2
Eli2 committed Apr 20, 2013
1 parent 3255478 commit a6872e3
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions src/animation/AnimationRender.cpp
View file
Expand Up @@ -503,7 +503,6 @@ bool Cedric_ApplyLightingFirstPartRefactor(Entity *io, Color3f &special_color, l
} else if(elapsed < 6000.f) { // 5 seconds to White
float ratio = (elapsed - 3000.f) * (1.0f / 3000);
special_color = Color3f(1.f, ratio, ratio);
special_color_flag = 2;
AddRandomSmoke(io, 2);
} else { // SFX finish
special_color_flag = 0;
Expand Down Expand Up @@ -687,10 +686,6 @@ static bool Cedric_ApplyLighting(EERIE_3DOBJ * eobj, EERIE_C_DATA * obj, Entity
tempColor.r *= special_color.r;
tempColor.g *= special_color.g;
tempColor.b *= special_color.b;
} else if(special_color_flag & 2) {
tempColor.r = 1.f;
tempColor.g = 0.f;
tempColor.b = 0.f;
} else if(special_color_flag & 4) { // HIGHLIGHT
tempColor.r += special_color.r;
tempColor.g += special_color.g;
Expand Down Expand Up @@ -1228,10 +1223,6 @@ static void Cedric_RenderObject(EERIE_3DOBJ * eobj, EERIE_C_DATA * obj, Entity *
| (((long)((float)((long)((tv[j].color >> 8) & 255)) * special_color.g) & 255) << 8)
| ((long)((float)((long)(tv[j].color & 255)) * (special_color.b)) & 255);
}
} else if(special_color_flag & 2) {
for (long j = 0; j < 3; j++) {
tv[j].color = 0xFFFF0000;
}
}

if((eobj->facelist[i].facetype & POLY_TRANS) || invisibility > 0.f) {
Expand Down Expand Up @@ -1448,18 +1439,6 @@ static void Cedric_RenderObject(EERIE_3DOBJ * eobj, EERIE_C_DATA * obj, Entity *
tv[o].color = eobj->vertexlist3[paf[o]].vert.color;
}
}

////////////////////////////////////////////////////////////////////////
// HALO HANDLING END
////////////////////////////////////////////////////////////////////////

if(special_color_flag & 2) {
TexturedVertex * tv2 = PushVertexInTableCull(&TexSpecialColor);

memcpy(tv2, tv, sizeof(TexturedVertex) * 3);

tv2[0].color = tv2[1].color = tv2[2].color = Color::gray(special_color.r).toBGR();
}
}
}
}
Expand Down

1 comment on commit a6872e3

@dscharrer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just removing the effect isn't good as the bright color in the incinerate effect was clearly intentional!

This can be seen with Lord Inut (save file linked in https://bugs.arx-libertatis.org/arx/issues/525 )

Please sign in to comment.