Remove duplicated code.

OpenXRay · Oct 30, 2014 · 72423af · 72423af
1 parent 52462dc
commit 72423af
Show file tree

Hide file tree

Showing 59 changed files with 40 additions and 5,300 deletions.
diff --git a/src/Layers/xrRender/DetailManager.cpp b/src/Layers/xrRender/DetailManager.cpp
@@ -6,7 +6,7 @@
 #pragma hdrstop
 
 #include "DetailManager.h"
-#include "cl_intersect.h"
+#include "xrCDB/Intersect.hpp"
 
 #ifdef _EDITOR
 #	include "ESceneClassList.h"

diff --git a/src/Layers/xrRender/DetailManager_Decompress.cpp b/src/Layers/xrRender/DetailManager_Decompress.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 #include "DetailManager.h"
-#include "cl_intersect.h"
+#include "xrCDB/Intersect.hpp"
 
 #ifdef _EDITOR
 #	include "scene.h"

diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp
@@ -695,7 +695,7 @@ void CSkeletonX_ext::_Load_hw	(Fvisual& V, void *	_verts_)
 //-----------------------------------------------------------------------------------------------------
 // Wallmarks
 //-----------------------------------------------------------------------------------------------------
-#include "cl_intersect.h"
+#include "xrCDB/Intersect.hpp"
 
 #ifdef	DEBUG
 

diff --git a/src/Layers/xrRender/SkeletonCustom.cpp b/src/Layers/xrRender/SkeletonCustom.cpp
@@ -541,7 +541,7 @@ void CKinematics::EnumBoneVertices	(SEnumVerticesCallback &C, u16 bone_id)
 	for ( u32 i=0; i<children.size(); i++ )
 		LL_GetChild( i )->EnumBoneVertices( C, bone_id );
 }
-#include "cl_intersect.h"
+#include "xrCDB/Intersect.hpp"
 
 DEFINE_VECTOR(Fobb,OBBVec,OBBVecIt);
 

diff --git a/src/Layers/xrRender/SkeletonX.cpp b/src/Layers/xrRender/SkeletonX.cpp
@@ -420,7 +420,7 @@ void 	get_pos_bones(const vertBoned4W &vert, Fvector& p, CKinematics* Parent )
 //-----------------------------------------------------------------------------------------------------
 // Wallmarks
 //-----------------------------------------------------------------------------------------------------
-#include "cl_intersect.h"
+#include "xrCDB/Intersect.hpp"
 BOOL	CSkeletonX::_PickBoneSoft1W	(IKinematics::pick_result &r, float dist, const Fvector& S, const Fvector& D, u16* indices, CBoneData::FacesVec& faces)
 {
 		return pick_bone<vertBoned1W>( Vertices1W, Parent, r, dist, S, D, indices, faces);