From a582b4ee82adf5fe4278c2174d5e75c0952ef2f2 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 4 Feb 2023 19:21:25 +0000 Subject: [PATCH] Remove write-only g3d_interp_outline --- common/include/3d.h | 6 ------ similar/3d/interp.cpp | 4 ---- similar/main/render.cpp | 18 ------------------ 3 files changed, 28 deletions(-) diff --git a/common/include/3d.h b/common/include/3d.h index cd21acc1c..53cb5a432 100644 --- a/common/include/3d.h +++ b/common/include/3d.h @@ -43,12 +43,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #endif -#if DXX_USE_EDITOR -namespace dcx { -extern int g3d_interp_outline; //if on, polygon models outlined in white -} -#endif - //Structure for storing u,v,light values. This structure doesn't have a //prefix because it was defined somewhere else before it was moved here struct g3s_uvl { diff --git a/similar/3d/interp.cpp b/similar/3d/interp.cpp index 4688816a6..71b7b8b5e 100644 --- a/similar/3d/interp.cpp +++ b/similar/3d/interp.cpp @@ -31,10 +31,6 @@ namespace dcx { -#if DXX_USE_EDITOR -int g3d_interp_outline; -#endif - namespace { constexpr std::integral_constant OP_EOF{}; //eof diff --git a/similar/main/render.cpp b/similar/main/render.cpp index 5dfb7771b..9314f0dd9 100644 --- a/similar/main/render.cpp +++ b/similar/main/render.cpp @@ -626,9 +626,6 @@ static void render_object_search(grs_canvas &canvas, const d_level_unique_light_ static void do_render_object(grs_canvas &canvas, const d_level_unique_light_state &LevelUniqueLightState, const vmobjptridx_t obj, window_rendered_data &window) { -#if DXX_USE_EDITOR - int save_3d_outline=0; - #endif int count = 0; #ifndef NDEBUG @@ -669,13 +666,6 @@ static void do_render_object(grs_canvas &canvas, const d_level_unique_light_stat //check for editor object -#if DXX_USE_EDITOR - if (EditorWindow && obj==Cur_object_index) { - save_3d_outline = g3d_interp_outline; - g3d_interp_outline=1; - } - #endif - #if DXX_USE_EDITOR if (_search_mode) render_object_search(canvas, LevelUniqueLightState, obj); @@ -694,14 +684,6 @@ static void do_render_object(grs_canvas &canvas, const d_level_unique_light_stat render_object(canvas, LevelUniqueLightState, o); } - - -#if DXX_USE_EDITOR - if (EditorWindow && obj==Cur_object_index) - g3d_interp_outline = save_3d_outline; - #endif - - } } }