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

Pass wake_up_rendered_objects arg by &

Browse source
This commit is contained in:
Kp 2014-12-13 04:11:07 +00:00
parent e027c821c9
commit 4bcf451745
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/fwdobject.h
View file

@ -292,7 +292,7 @@ void dead_player_frame();
// returns object number // returns object number
objnum_t drop_marker_object(const vms_vector &pos, segnum_t segnum, const vms_matrix &orient, int marker_num); 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); void fuelcen_check_for_goal (vsegptr_t);
#endif #endif

2
similar/main/gamerend.cpp
View file

@ -597,7 +597,7 @@ void game_render_frame_mono()
update_rendered_data(Window_rendered_data[0], Viewer, 0); update_rendered_data(Window_rendered_data[0], Viewer, 0);
render_frame(0, 0); render_frame(0, 0);
wake_up_rendered_objects(Viewer, 0); wake_up_rendered_objects(Viewer, Window_rendered_data[0]);
show_HUD_names(); show_HUD_names();
Viewer = viewer_save; Viewer = viewer_save;

2
similar/main/gauges.cpp
View file

@ -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. // HACK! If guided missile, wake up robots as necessary.
if (viewer->type == OBJ_WEAPON) { if (viewer->type == OBJ_WEAPON) {
// -- Used to require to be GUIDED -- if (viewer->id == GUIDEDMISS_ID) // -- 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) { if (label) {

6
similar/main/object.cpp
View file

@ -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. // *viewer is a viewer, probably a missile.
// wake up all robots that were rendered last frame subject to some constraints. // 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. // Make sure that we are processing current data.
if (timer_query() != Window_rendered_data[window_num].time) { if (timer_query() != window.time) {
return; return;
} }
Ai_last_missile_camera = viewer; 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; object *objp;
int fcval = d_tick_count & 3; int fcval = d_tick_count & 3;