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

Return objptridx_t from create_weapon_object

Browse source
This commit is contained in:
Kp 2014-01-11 17:55:01 +00:00
parent 68125a472a
commit 3bdfc28ef5
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
similar/main/laser.cpp
View file

@ -229,12 +229,10 @@ static void do_muzzle_stuff(int segnum, vms_vector *pos)
}
//creates a weapon object
static int create_weapon_object(int weapon_type,int segnum,vms_vector *position)
static objptridx_t create_weapon_object(int weapon_type,int segnum,vms_vector *position)
{
int rtype=-1;
fix laser_radius = -1;
int objnum;
object *obj;
switch( Weapon_info[weapon_type].render_type ) {
@ -264,11 +262,9 @@ static int create_weapon_object(int weapon_type,int segnum,vms_vector *position)
Assert(laser_radius != -1);
Assert(rtype != -1);
objnum = obj_create( OBJ_WEAPON, weapon_type, segnum, position, NULL, laser_radius, CT_WEAPON, MT_PHYSICS, rtype );
if (objnum == object_none)
return objnum;
obj = &Objects[objnum];
objptridx_t obj = obj_create( OBJ_WEAPON, weapon_type, segnum, position, NULL, laser_radius, CT_WEAPON, MT_PHYSICS, rtype );
if (obj == object_none)
return obj;
if (Weapon_info[weapon_type].render_type == WEAPON_RENDER_POLYMODEL) {
obj->rtype.pobj_info.model_num = Weapon_info[get_weapon_id(obj)].model_num;
@ -288,7 +284,7 @@ static int create_weapon_object(int weapon_type,int segnum,vms_vector *position)
#endif
return objnum;
return obj;
}
#if defined(DXX_BUILD_DESCENT_II)