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

Pass multi_send_robot_fire vector by const &

Browse source
This commit is contained in:
Kp 2014-10-30 03:37:22 +00:00
parent 6024bf0369
commit 5f9b06cce9
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/multibot.h
View file

@ -48,7 +48,7 @@ extern int robot_fired[MAX_ROBOTS_CONTROLLED];
int multi_can_move_robot(vobjptridx_t objnum, int agitation);
void multi_send_robot_position(vobjptridx_t objnum, int fired);
void multi_send_robot_fire(vobjptridx_t objnum, int gun_num, const vms_vector *fire);
void multi_send_robot_fire(vobjptridx_t objnum, int gun_num, const vms_vector &fire);
void multi_send_claim_robot(vobjptridx_t objnum);
void multi_send_robot_explode(objptridx_t objnum, objnum_t killer);
void multi_send_create_robot(int robotcen, objnum_t objnum, int type);

6
similar/main/ai.cpp
View file

@ -1243,7 +1243,7 @@ player_led: ;
if (Game_mode & GM_MULTI)
{
ai_multi_send_robot_position(obj, -1);
multi_send_robot_fire(obj, obj->ctype.ai_info.CURRENT_GUN, &fire_vec);
multi_send_robot_fire(obj, obj->ctype.ai_info.CURRENT_GUN, fire_vec);
}
create_awareness_event(obj, PA_NEARBY_ROBOT_FIRED);
@ -3645,10 +3645,10 @@ _exit_cheat:
ai_multi_send_robot_position(obj, -1);
#if defined(DXX_BUILD_DESCENT_II)
if (aip->SUB_FLAGS & SUB_FLAGS_SPROX)
multi_send_robot_fire(obj, -2, &fire_vec);
multi_send_robot_fire(obj, -2, fire_vec);
else
#endif
multi_send_robot_fire(obj, -1, &fire_vec);
multi_send_robot_fire(obj, -1, fire_vec);
}
}
break;

10
similar/main/multibot.cpp
View file

@ -433,7 +433,7 @@ void multi_send_robot_position(const vobjptridx_t objnum, int force)
return;
}
void multi_send_robot_fire(const vobjptridx_t obj, int gun_num, const vms_vector *fire)
void multi_send_robot_fire(const vobjptridx_t obj, int gun_num, const vms_vector &fire)
{
// Send robot fire event
int loc = 0;
@ -449,13 +449,13 @@ void multi_send_robot_fire(const vobjptridx_t obj, int gun_num, const vms_vector
loc += 3;
multibuf[loc] = gun_num; loc += 1;
#ifndef WORDS_BIGENDIAN
memcpy(multibuf+loc, fire, sizeof(vms_vector)); loc += sizeof(vms_vector); // 12
memcpy(multibuf+loc, &fire, sizeof(vms_vector)); loc += sizeof(vms_vector); // 12
// --------------------------
// Total = 18
#else
swapped_vec.x = (fix)INTEL_INT((int)fire->x);
swapped_vec.y = (fix)INTEL_INT((int)fire->y);
swapped_vec.z = (fix)INTEL_INT((int)fire->z);
swapped_vec.x = (fix)INTEL_INT((int)fire.x);
swapped_vec.y = (fix)INTEL_INT((int)fire.y);
swapped_vec.z = (fix)INTEL_INT((int)fire.z);
memcpy(multibuf+loc, &swapped_vec, sizeof(vms_vector)); loc += sizeof(vms_vector);
#endif