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

Pass canvas to Laser_render

Browse source
This commit is contained in:
Kp 2017-03-11 19:56:26 +00:00
parent 753cbafe61
commit a55de34884
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/laser.h
View file

@ -70,7 +70,7 @@ namespace dsx {
#ifdef NEWHOMER
void calc_d_homer_tick();
#endif
void Laser_render(const object_base &obj);
void Laser_render(grs_canvas &, const object_base &obj);
objptridx_t Laser_player_fire(vobjptridx_t obj, weapon_id_type laser_type, int gun_num, int make_sound, const vms_vector &shot_orientation);
void Laser_do_weapon_sequence(vobjptridx_t obj);
void Flare_create(vobjptridx_t obj);

4
similar/main/laser.cpp
View file

@ -84,7 +84,7 @@ static objptridx_t find_homing_object(const vms_vector &curpos, const vobjptridx
// Called by render code.... determines if the laser is from a robot or the
// player and calls the appropriate routine.
void Laser_render(const object_base &obj)
void Laser_render(grs_canvas &canvas, const object_base &obj)
{
auto &wi = Weapon_info[get_weapon_id(obj)];
switch(wi.render_type)
@ -94,7 +94,7 @@ void Laser_render(const object_base &obj)
//Laser_draw_one(obj-Objects, Weapon_info[obj->id].bitmap );
break;
case WEAPON_RENDER_BLOB:
draw_object_blob(*grd_curcanv, obj, wi.bitmap);
draw_object_blob(canvas, obj, wi.bitmap);
break;
case WEAPON_RENDER_POLYMODEL:
break;

2
similar/main/object.cpp
View file

@ -761,7 +761,7 @@ void render_object(const vobjptridx_t obj)
gr_settransblend(*grd_curcanv, 7, GR_BLEND_ADDITIVE_A);
}
Laser_render(obj);
Laser_render(*grd_curcanv, obj);
break;
default: