diff --git a/SConstruct b/SConstruct index f1e8620bb..1b6a07616 100644 --- a/SConstruct +++ b/SConstruct @@ -367,6 +367,7 @@ class DXXProgram(DXXCommon): 'editor/kcurve.c', 'editor/kfuncs.c', 'editor/khelp.c', +'editor/medsel.c', 'editor/texture.c', ] ] @@ -628,7 +629,6 @@ class D1XProgram(DXXProgram): 'editor/meddraw.c', 'editor/medmisc.c', 'editor/medrobot.c', -'editor/medsel.c', 'editor/medwall.c', 'editor/mine.c', 'editor/objpage.c', @@ -775,7 +775,6 @@ class D2XProgram(DXXProgram): 'editor/meddraw.c', 'editor/medmisc.c', 'editor/medrobot.c', -'editor/medsel.c', 'editor/medwall.c', 'editor/mine.c', 'editor/objpage.c', diff --git a/d2x-rebirth/editor/medsel.c b/d2x-rebirth/editor/medsel.c deleted file mode 100644 index edf1c183f..000000000 --- a/d2x-rebirth/editor/medsel.c +++ /dev/null @@ -1,127 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ - -/* - * - * Routines stripped from med.c for segment selection - * - */ - -#include -#include -#include -#include -#include "gr.h" -#include "ui.h" -#include "key.h" -#include "dxxerror.h" -#include "u_mem.h" -#include "inferno.h" -#include "editor.h" -#include "editor/esegment.h" -#include "segment.h" -#include "object.h" - -typedef struct sort_element { - short segnum; - fix dist; -} sort_element; - -//compare the distance of two segments. slow, since it computes the -//distance each time -int segdist_cmp(sort_element *s0,sort_element *s1) -{ - return (s0->dist==s1->dist)?0:((s0->distdist)?-1:1); - -} - - -//find the distance between a segment and a point -fix compute_dist(segment *seg,vms_vector *pos) -{ - vms_vector delta; - - compute_segment_center(&delta,seg); - vm_vec_sub2(&delta,pos); - - return vm_vec_mag(&delta); - -} - -//sort a list of segments, in order of closeness to pos -void sort_seg_list(int n_segs,short *segnumlist,vms_vector *pos) -{ - int i; - sort_element *sortlist; - - sortlist = d_calloc(n_segs, sizeof(*sortlist)); - - for (i=0;ipos); - editor_status("%i element selected list sorted.",N_selected_segs); - - return 1; -} - -int SelectNextFoundSeg(void) -{ - if (++Found_seg_index >= N_found_segs) - Found_seg_index = 0; - - Cursegp = &Segments[Found_segs[Found_seg_index]]; - med_create_new_segment_from_cursegp(); - - Update_flags |= UF_WORLD_CHANGED; - - if (Lock_view_to_cursegp) - set_view_target_from_segment(Cursegp); - - editor_status("Curseg assigned to next found segment."); - - return 1; -} - -int SelectPreviousFoundSeg(void) -{ - if (Found_seg_index > 0) - Found_seg_index--; - else - Found_seg_index = N_found_segs-1; - - Cursegp = &Segments[Found_segs[Found_seg_index]]; - med_create_new_segment_from_cursegp(); - - Update_flags |= UF_WORLD_CHANGED; - - if (Lock_view_to_cursegp) - set_view_target_from_segment(Cursegp); - - editor_status("Curseg assigned to previous found segment."); - - return 1; -} - diff --git a/d1x-rebirth/editor/medsel.c b/similar/editor/medsel.c similarity index 100% rename from d1x-rebirth/editor/medsel.c rename to similar/editor/medsel.c