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

Pass object_base &to nd_read_shortpos

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent ae7e808a24
commit cfb08ac2cd
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
similar/main/newdemo.cpp
View file

@ -508,14 +508,15 @@ static void nd_read_angvec(vms_angvec &v)
nd_read_fixang(&v.h);
}
static void nd_read_shortpos(const vobjptr_t obj)
static void nd_read_shortpos(object_base &obj)
{
ubyte render_type;
shortpos sp{};
render_type = obj->render_type;
if (((render_type == RT_POLYOBJ) || (render_type == RT_HOSTAGE) || (render_type == RT_MORPH)) || (obj->type == OBJ_CAMERA)) {
render_type = obj.render_type;
if ((render_type == RT_POLYOBJ || render_type == RT_HOSTAGE || render_type == RT_MORPH) || obj.type == OBJ_CAMERA)
{
range_for (auto &i, sp.bytemat)
nd_read_byte(&(i));
}
@ -529,8 +530,8 @@ static void nd_read_shortpos(const vobjptr_t obj)
nd_read_short(&(sp.velz));
my_extract_shortpos(obj, &sp);
if (obj->type == OBJ_FIREBALL && get_fireball_id(obj) == VCLIP_MORPHING_ROBOT && render_type == RT_FIREBALL && obj->control_type == CT_EXPLOSION)
extract_orient_from_segment(&obj->orient, vcsegptr(obj->segnum));
if (obj.type == OBJ_FIREBALL && get_fireball_id(obj) == VCLIP_MORPHING_ROBOT && render_type == RT_FIREBALL && obj.control_type == CT_EXPLOSION)
extract_orient_from_segment(&obj.orient, vcsegptr(obj.segnum));
}