TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove obsolete draw_vclip_object parameter lighted

Browse source 
It is always 0.
This commit is contained in:
Kp 2019-04-13 18:00:07 +00:00
parent 645daa2304
commit f69ba8ae82
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/vclip.h
View file

@ -73,7 +73,7 @@ constexpr std::integral_constant<int, -1> 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);
}

2
similar/main/fireball.cpp
View file

@ -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)]);
}
// --------------------------------------------------------------------------------------------------------------------

7
similar/main/vclip.cpp
View file

@ -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]);
}
}