diff --git a/common/main/vclip.h b/common/main/vclip.h index 4915b8e40..683027c77 100644 --- a/common/main/vclip.h +++ b/common/main/vclip.h @@ -73,7 +73,7 @@ constexpr std::integral_constant vclip_none{}; namespace dsx { // draw an object which renders as a vclip. -void draw_vclip_object(grs_canvas &, vcobjptridx_t obj, fix timeleft, int lighted, const vclip &); +void draw_vclip_object(grs_canvas &, vcobjptridx_t obj, fix timeleft, const vclip &); void draw_weapon_vclip(const d_vclip_array &Vclip, const weapon_info_array &Weapon_info, grs_canvas &, vcobjptridx_t obj); } diff --git a/similar/main/fireball.cpp b/similar/main/fireball.cpp index 33b6d8175..51b697f11 100644 --- a/similar/main/fireball.cpp +++ b/similar/main/fireball.cpp @@ -430,7 +430,7 @@ static void object_create_debris(fvmsegptridx &vmsegptridx, const object_base &p void draw_fireball(const d_vclip_array &Vclip, grs_canvas &canvas, const vcobjptridx_t obj) { if ( obj->lifeleft > 0 ) - draw_vclip_object(canvas, obj, obj->lifeleft, 0, Vclip[get_fireball_id(obj)]); + draw_vclip_object(canvas, obj, obj->lifeleft, Vclip[get_fireball_id(obj)]); } // -------------------------------------------------------------------------------------------------------------------- diff --git a/similar/main/vclip.cpp b/similar/main/vclip.cpp index 05a661cda..cedf0c52f 100644 --- a/similar/main/vclip.cpp +++ b/similar/main/vclip.cpp @@ -46,7 +46,7 @@ namespace dsx { d_vclip_array Vclip; // General purpose vclips. //draw an object which renders as a vclip -void draw_vclip_object(grs_canvas &canvas, const vcobjptridx_t obj, const fix timeleft, const int lighted, const vclip &vc) +void draw_vclip_object(grs_canvas &canvas, const vcobjptridx_t obj, const fix timeleft, const vclip &vc) { const auto nf = vc.num_frames; int bitmapnum = (nf - f2i(fixdiv((nf - 1) * timeleft, vc.play_time))) - 1; @@ -56,9 +56,8 @@ void draw_vclip_object(grs_canvas &canvas, const vcobjptridx_t obj, const fix ti if (bitmapnum >= 0 ) { if (vc.flags & VF_ROD) - draw_object_tmap_rod(canvas, obj, vc.frames[bitmapnum], lighted); + draw_object_tmap_rod(canvas, obj, vc.frames[bitmapnum], 0); else { - Assert(lighted==0); //blob cannot now be lighted draw_object_blob(canvas, obj, vc.frames[bitmapnum]); } } @@ -87,7 +86,7 @@ void draw_weapon_vclip(const d_vclip_array &Vclip, const weapon_info_array &Weap } - draw_vclip_object(canvas, obj, modtime, 0, Vclip[vclip_num]); + draw_vclip_object(canvas, obj, modtime, Vclip[vclip_num]); } }