From 68834fb929a7d0a3825d6fd2424c52c084f1fab9 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 5 May 2015 03:20:42 +0000 Subject: [PATCH] Expand render_mine window_rendered_data helper inline --- common/main/render.h | 6 ------ similar/main/endlevel.cpp | 3 ++- similar/main/terrain.cpp | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/common/main/render.h b/common/main/render.h index a83a60e39..2a01230ad 100644 --- a/common/main/render.h +++ b/common/main/render.h @@ -124,12 +124,6 @@ void render_mine(segnum_t start_seg_num, fix eye_offset, window_rendered_data &) void update_rendered_data(window_rendered_data &window, vobjptr_t viewer, int rear_view_flag); #endif -static inline void render_mine(segnum_t start_seg_num, fix eye_offset) -{ - window_rendered_data window; - render_mine(start_seg_num, eye_offset, window); -} - static inline void render_frame(fix eye_offset) { window_rendered_data window; diff --git a/similar/main/endlevel.cpp b/similar/main/endlevel.cpp index fce91d882..f2cc128aa 100644 --- a/similar/main/endlevel.cpp +++ b/similar/main/endlevel.cpp @@ -1113,7 +1113,8 @@ static void endlevel_render_mine(fix eye_offset) else g3_set_view_matrix(Viewer_eye,Viewer->orient,Render_zoom); - render_mine(start_seg_num,eye_offset); + window_rendered_data window; + render_mine(start_seg_num, eye_offset, window); } void render_endlevel_frame(fix eye_offset) diff --git a/similar/main/terrain.cpp b/similar/main/terrain.cpp index 88e776ba2..c22d19b4b 100644 --- a/similar/main/terrain.cpp +++ b/similar/main/terrain.cpp @@ -129,9 +129,10 @@ static void draw_cell(int i,int j,g3s_point *p0,g3s_point *p1,g3s_point *p2,g3s_ mine_tiles_drawn |= 8; if (mine_tiles_drawn == 0xf) { - render_mine(exit_segnum, 0); //draw_exit_model(); mine_tiles_drawn=-1; + window_rendered_data window; + render_mine(exit_segnum, 0, window); //if (ext_expl_playing) // draw_fireball(&external_explosion); }