From 4bcf451745b772d5b02f18e0e69b141f0a2c8aaf Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 13 Dec 2014 04:11:07 +0000 Subject: [PATCH] Pass wake_up_rendered_objects arg by & --- common/main/fwdobject.h | 2 +- similar/main/gamerend.cpp | 2 +- similar/main/gauges.cpp | 2 +- similar/main/object.cpp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/main/fwdobject.h b/common/main/fwdobject.h index 9abcda1d3..5a22d5a17 100644 --- a/common/main/fwdobject.h +++ b/common/main/fwdobject.h @@ -292,7 +292,7 @@ void dead_player_frame(); // returns object number objnum_t drop_marker_object(const vms_vector &pos, segnum_t segnum, const vms_matrix &orient, int marker_num); -void wake_up_rendered_objects(vobjptridx_t gmissp, int window_num); +void wake_up_rendered_objects(vobjptridx_t gmissp, window_rendered_data &window); void fuelcen_check_for_goal (vsegptr_t); #endif diff --git a/similar/main/gamerend.cpp b/similar/main/gamerend.cpp index 77a44661c..305bf1fd0 100644 --- a/similar/main/gamerend.cpp +++ b/similar/main/gamerend.cpp @@ -597,7 +597,7 @@ void game_render_frame_mono() update_rendered_data(Window_rendered_data[0], Viewer, 0); render_frame(0, 0); - wake_up_rendered_objects(Viewer, 0); + wake_up_rendered_objects(Viewer, Window_rendered_data[0]); show_HUD_names(); Viewer = viewer_save; diff --git a/similar/main/gauges.cpp b/similar/main/gauges.cpp index 0cdcc1293..27c3393be 100644 --- a/similar/main/gauges.cpp +++ b/similar/main/gauges.cpp @@ -3216,7 +3216,7 @@ void do_cockpit_window_view(int win,const objptridx_t viewer,int rear_view_flag, // HACK! If guided missile, wake up robots as necessary. if (viewer->type == OBJ_WEAPON) { // -- Used to require to be GUIDED -- if (viewer->id == GUIDEDMISS_ID) - wake_up_rendered_objects(viewer, win+1); + wake_up_rendered_objects(viewer, Window_rendered_data[win+1]); } if (label) { diff --git a/similar/main/object.cpp b/similar/main/object.cpp index 8fc3892ab..3040f6cee 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -2108,16 +2108,16 @@ objnum_t drop_marker_object(const vms_vector &pos,segnum_t segnum,const vms_matr // *viewer is a viewer, probably a missile. // wake up all robots that were rendered last frame subject to some constraints. -void wake_up_rendered_objects(const vobjptridx_t viewer, int window_num) +void wake_up_rendered_objects(const vobjptridx_t viewer, window_rendered_data &window) { // Make sure that we are processing current data. - if (timer_query() != Window_rendered_data[window_num].time) { + if (timer_query() != window.time) { return; } Ai_last_missile_camera = viewer; - range_for (const auto objnum, Window_rendered_data[window_num].rendered_robots) + range_for (const auto objnum, window.rendered_robots) { object *objp; int fcval = d_tick_count & 3;