From a43c5bd6d48ede0bf0fce69525c1db6da9c67b50 Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 11 Aug 2017 23:43:54 +0000 Subject: [PATCH] Remove long-dead STATION_ENABLED code Function bm_load does not exist in current tip, 0.58.1-d2x, 0.51-d2x, nor various early snapshots of D2X (not D2X-Rebirth, just D2X). Attempting to enable STATION_ENABLED fails without this function. Since it seems to have been absent for at least 10 years (0.51-d2x tagged Feb 2007), and possibly more than 16 years (D2X snapshots from 2001), it seems reasonable to assume no one has used this code in any open source release. Remove it. --- similar/main/endlevel.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/similar/main/endlevel.cpp b/similar/main/endlevel.cpp index 61166e77e..17bc33d32 100644 --- a/similar/main/endlevel.cpp +++ b/similar/main/endlevel.cpp @@ -122,7 +122,6 @@ static array fly_objects; #define EL_CHASING 6 //chasing player to station #define SHORT_SEQUENCE 1 //if defined, end sequnce when panning starts -//#define STATION_ENABLED 1 //if defined, load & use space station model int Endlevel_sequence = 0; @@ -164,12 +163,6 @@ unsigned exit_modelnum,destroyed_exit_modelnum; static vms_vector station_pos{0xf8c4<<10,0x3c1c<<12,0x372<<10}; -#ifdef STATION_ENABLED -static grs_bitmap *station_bitmap; -grs_bitmap **station_bitmap_list[1]; -static unsigned station_modelnum; -#endif - static vms_vector mine_exit_point; static vms_vector mine_ground_exit_point; static vms_vector mine_side_exit_point; @@ -253,13 +246,6 @@ void init_endlevel() //##load_terrain("matt5b.bbm"); //load bitmap as height array //##//load_terrain("ttest2.bbm"); //load bitmap as height array - #ifdef STATION_ENABLED - station_bitmap = bm_load("steel3.bbm"); - station_bitmap_list[0] = &station_bitmap; - - station_modelnum = load_polygon_model("station.pof",1,station_bitmap_list,NULL); - #endif - //!! exit_bitmap = bm_load("steel1.bbm"); //!! exit_bitmap_list[0] = &exit_bitmap; @@ -991,10 +977,6 @@ static void render_external_scene(fvcobjptridx &vcobjptridx, grs_canvas &canvas, } } - #ifdef STATION_ENABLED - draw_polygon_model(station_pos,&vmd_identity_matrix,NULL,station_modelnum,0,lrgb,NULL,NULL); - #endif - #if DXX_USE_OGL ogl_toggle_depth_test(0); Render_depth = (200-(vm_vec_dist_quick(mine_ground_exit_point, Viewer_eye)/F1_0))/36;