From 9d4a55ae47dfa8cca970fdc5eefb8fb4239edd52 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 3 Oct 2015 17:17:49 +0000 Subject: [PATCH] Move fvi globals into anonymous namespace --- similar/main/fvi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/similar/main/fvi.cpp b/similar/main/fvi.cpp index b363dfd4e..bcdca9989 100644 --- a/similar/main/fvi.cpp +++ b/similar/main/fvi.cpp @@ -611,8 +611,6 @@ struct fvi_segments_visited_t : public fvi_segment_visit_count_t, public visited { }; -} - int fvi_nest_count; //these vars are used to pass vars from fvi_sub() to find_vector_intersection() @@ -623,6 +621,8 @@ int fvi_hit_side_seg;// what seg the hitside is in vms_vector wall_norm; //ptr to surface normal of hit wall segnum_t fvi_hit_seg2; // what segment the hit point is in +} + static int fvi_sub(vms_vector &intp,segnum_t &ints,const vms_vector &p0,const vcsegptridx_t startseg,const vms_vector &p1,fix rad,objnum_t thisobjnum,const std::pair ignore_obj_list,int flags,fvi_info::segment_array_t &seglist,segnum_t entry_seg, fvi_segments_visited_t &visited); //What the hell is fvi_hit_seg for???