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

Remove return value truncation in find_object_seg

Browse source
This commit is contained in:
Kp 2016-01-09 16:38:13 +00:00
parent 98f5afa9f8
commit a32d9f01a1
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/fwd-object.h
View file

@ -261,7 +261,7 @@ int update_object_seg(vobjptridx_t obj);
// any segment, returns -1. Note: This function is defined in
// gameseg.h, but object.h depends on gameseg.h, and object.h is where
// object is defined...get it?
segnum_t find_object_seg(vobjptr_t obj);
segptridx_t find_object_seg(vobjptr_t obj);
// go through all objects and make sure they have the correct segment
// numbers used when debugging is on

5
similar/editor/eobject.cpp
View file

@ -828,8 +828,9 @@ static void move_object_to_position(const vobjptridx_t objp, const vms_vector &n
if (fate == HIT_WALL) {
objp->pos = hit_info.hit_pnt;
auto new_segnum = find_object_seg(objp);
obj_relink(objp, vsegptridx(new_segnum));
const auto &&segp = find_object_seg(objp);
if (segp != segment_none)
obj_relink(objp, segp);
} else {
editor_status("Attempted to move object out of mine. Object not moved.");
}

4
similar/main/object.cpp
View file

@ -1933,7 +1933,7 @@ void reset_objects(int n_objs)
}
//Tries to find a segment for an object, using find_point_seg()
segnum_t find_object_seg(const vobjptr_t obj)
segptridx_t find_object_seg(const vobjptr_t obj)
{
return find_point_seg(obj->pos, vsegptridx(obj->segnum));
}
@ -1949,7 +1949,7 @@ int update_object_seg(const vobjptridx_t obj)
return 0;
if ( newseg != obj->segnum )
obj_relink(obj, vsegptridx(newseg));
obj_relink(obj, newseg);
return 1;
}