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

Pass obj_create_copy vector by const &

Browse source
This commit is contained in:
Kp 2014-11-01 03:06:04 +00:00
parent 5f9b06cce9
commit 7e3c7a413a
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/object.h
View file

@ -666,7 +666,7 @@ objptridx_t obj_create(object_type_t type, ubyte id, vsegptridx_t segnum, const
ubyte ctype, ubyte mtype, ubyte rtype);
// make a copy of an object. returs num of new object
objptridx_t obj_create_copy(objnum_t objnum, vms_vector *new_pos, segnum_t newsegnum);
objptridx_t obj_create_copy(objnum_t objnum, const vms_vector &new_pos, segnum_t newsegnum);
// remove object from the world
void obj_delete(vobjptridx_t objnum);

2
similar/editor/group.cpp
View file

@ -459,7 +459,7 @@ static void duplicate_group(sbyte *vertex_ids, group::segment_array_type_t &segm
range_for (auto objp, objrange)
{
if (objp->type != OBJ_PLAYER) {
const objptridx_t new_obj_id = obj_create_copy(objp, &objp->pos, new_segment_id);
const auto new_obj_id = obj_create_copy(objp, objp->pos, new_segment_id);
(void)new_obj_id; // FIXME!
}
}

4
similar/main/object.cpp
View file

@ -1203,7 +1203,7 @@ objptridx_t obj_create(object_type_t type, ubyte id,vsegptridx_t segnum,const vm
#ifdef EDITOR
//create a copy of an object. returns new object number
objptridx_t obj_create_copy(objnum_t objnum, vms_vector *new_pos, segnum_t newsegnum)
objptridx_t obj_create_copy(objnum_t objnum, const vms_vector &new_pos, segnum_t newsegnum)
{
// Find next free object
const objptridx_t obj = obj_allocate();
@ -1213,7 +1213,7 @@ objptridx_t obj_create_copy(objnum_t objnum, vms_vector *new_pos, segnum_t newse
*obj = Objects[objnum];
obj->pos = obj->last_pos = *new_pos;
obj->pos = obj->last_pos = new_pos;
obj->next = obj->prev = object_none;
obj->segnum = segment_none;