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

Propagate failure in create_gated_robot

Browse source
This commit is contained in:
Kp 2014-05-25 22:58:26 +00:00
parent 1eabce05b1
commit 61b3b52868
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/ai.cpp
View file

@ -1955,8 +1955,6 @@ static objptridx_t create_gated_robot( int segnum, int object_id, vms_vector *po
#elif defined(DXX_BUILD_DESCENT_II)
const int maximum_gated_robots = 2*Difficulty_level + 6;
#endif
const objptridx_t failure = object_none;
#if defined(DXX_BUILD_DESCENT_II)
if (GameTime64 - Last_gate_time < Gate_interval)
return object_none;
@ -1970,7 +1968,7 @@ static objptridx_t create_gated_robot( int segnum, int object_id, vms_vector *po
if (count > maximum_gated_robots)
{
Last_gate_time = GameTime64 - 3*Gate_interval/4;
return failure;
return object_none;
}
if (pos == NULL)
@ -1984,7 +1982,7 @@ static objptridx_t create_gated_robot( int segnum, int object_id, vms_vector *po
// See if legal to place object here. If not, move about in segment and try again.
if (check_object_object_intersection(&object_pos, objsize, segp)) {
Last_gate_time = GameTime64 - 3*Gate_interval/4;
return failure;
return object_none;
}
objptridx_t objp = obj_create(OBJ_ROBOT, object_id, segnum, &object_pos, &vmd_identity_matrix, objsize, CT_AI, MT_PHYSICS, RT_POLYOBJ);