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

Pass canvas to draw_weapon_vclip

Browse source
This commit is contained in:
Kp 2017-03-11 19:56:25 +00:00
parent 48a6adbe87
commit 450b3ec4f5
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/vclip.h
View file

@ -81,7 +81,7 @@ extern array<vclip, VCLIP_MAXNUM> Vclip;
// draw an object which renders as a vclip.
void draw_vclip_object(grs_canvas &, vcobjptridx_t obj, fix timeleft, int lighted, int vclip_num);
void draw_weapon_vclip(vobjptridx_t obj);
void draw_weapon_vclip(grs_canvas &, vcobjptridx_t obj);
}
namespace dcx {

2
similar/main/object.cpp
View file

@ -685,7 +685,7 @@ void render_object(const vobjptridx_t obj)
gr_settransblend(*grd_curcanv, 7, GR_BLEND_ADDITIVE_A);
}
draw_weapon_vclip(obj);
draw_weapon_vclip(*grd_curcanv, obj);
break;
case RT_HOSTAGE:

5
similar/main/vclip.cpp
View file

@ -68,8 +68,7 @@ void draw_vclip_object(grs_canvas &canvas, const vcobjptridx_t obj, const fix ti
}
}
void draw_weapon_vclip(const vobjptridx_t obj)
void draw_weapon_vclip(grs_canvas &canvas, const vcobjptridx_t obj)
{
int vclip_num;
fix modtime,play_time;
@ -103,7 +102,7 @@ void draw_weapon_vclip(const vobjptridx_t obj)
while (modtime > play_time)
modtime -= play_time;
draw_vclip_object(*grd_curcanv, obj, modtime, 0, vclip_num);
draw_vclip_object(canvas, obj, modtime, 0, vclip_num);
}
}