From 7e3c7a413ab83cf3e54d4598f82eb99a1a8f909d Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 1 Nov 2014 03:06:04 +0000 Subject: [PATCH] Pass obj_create_copy vector by const & --- common/main/object.h | 2 +- similar/editor/group.cpp | 2 +- similar/main/object.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/main/object.h b/common/main/object.h index df30213bd..aa0fa3eae 100644 --- a/common/main/object.h +++ b/common/main/object.h @@ -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); diff --git a/similar/editor/group.cpp b/similar/editor/group.cpp index 912ce2c22..1744ce00c 100644 --- a/similar/editor/group.cpp +++ b/similar/editor/group.cpp @@ -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! } } diff --git a/similar/main/object.cpp b/similar/main/object.cpp index 72a8075a3..9fcdc4657 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -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;