From 5f9b06cce92ac0d94d7db6e4142509c1db39a14b Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 30 Oct 2014 03:37:22 +0000 Subject: [PATCH] Pass multi_send_robot_fire vector by const & --- common/main/multibot.h | 2 +- similar/main/ai.cpp | 6 +++--- similar/main/multibot.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/main/multibot.h b/common/main/multibot.h index 8f14352ea..d9ec0f905 100644 --- a/common/main/multibot.h +++ b/common/main/multibot.h @@ -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); diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index 27f52f395..b24467b9c 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -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; diff --git a/similar/main/multibot.cpp b/similar/main/multibot.cpp index bf5f6f337..e6b861c73 100644 --- a/similar/main/multibot.cpp +++ b/similar/main/multibot.cpp @@ -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