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

Pass object &to do_firing_stuff

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent 2a19da88d4
commit 49f2768a00
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/ai.cpp
View file

@ -1503,7 +1503,7 @@ void make_random_vector(vms_vector &vec)
namespace dsx {
// -------------------------------------------------------------------------------------------------------------------
static void do_firing_stuff(const vobjptr_t obj, int player_visibility, const vms_vector &vec_to_player)
static void do_firing_stuff(object &obj, int player_visibility, const vms_vector &vec_to_player)
{
#if defined(DXX_BUILD_DESCENT_I)
if (player_visibility >= 1)
@ -1512,10 +1512,10 @@ static void do_firing_stuff(const vobjptr_t obj, int player_visibility, const vm
#endif
{
// Now, if in robot's field of view, lock onto player
fix dot = vm_vec_dot(obj->orient.fvec, vec_to_player);
fix dot = vm_vec_dot(obj.orient.fvec, vec_to_player);
if ((dot >= 7*F1_0/8) || (get_local_player_flags() & PLAYER_FLAGS_CLOAKED)) {
ai_static *aip = &obj->ctype.ai_info;
ai_local *ailp = &obj->ctype.ai_info.ail;
ai_static *const aip = &obj.ctype.ai_info;
ai_local *const ailp = &obj.ctype.ai_info.ail;
switch (aip->GOAL_STATE) {
case AIS_NONE:
@ -1530,7 +1530,7 @@ static void do_firing_stuff(const vobjptr_t obj, int player_visibility, const vm
break;
}
} else if (dot >= F1_0/2) {
ai_static *aip = &obj->ctype.ai_info;
ai_static *const aip = &obj.ctype.ai_info;
switch (aip->GOAL_STATE) {
case AIS_NONE:
case AIS_REST: