xrCDB: rename CObjectSpace::Lock -> CObjectSpace::lock.

OpenXRay · Nov 10, 2015 · ac3b38d · ac3b38d
1 parent bfd8375
commit ac3b38d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/xrCDB/xr_area.h b/src/xrCDB/xr_area.h
@@ -23,7 +23,7 @@ class	XRCDB_API						CObjectSpace
 {
 private:
 	// Debug
-	Lock					Lock;
+	Lock					lock;
 	CDB::MODEL							Static;
 	Fbox								m_BoundingVolume;
 	xrXRC								xrc;				// MT: dangerous

diff --git a/src/xrCDB/xr_area_raypick.cpp b/src/xrCDB/xr_area_raypick.cpp
@@ -23,10 +23,10 @@ using namespace	collide;
 //--------------------------------------------------------------------------------
 BOOL CObjectSpace::RayTest	( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object)
 {
-	Lock.Enter		();
+	lock.Enter		();
 	BOOL	_ret	= _RayTest(start,dir,range,tgt,cache,ignore_object);
 	r_spatial.clear	();
-	Lock.Leave		();
+    lock.Leave		();
 	return			_ret;
 }
 BOOL CObjectSpace::_RayTest	( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object)
@@ -100,10 +100,10 @@ BOOL CObjectSpace::_RayTest	( const Fvector &start, const Fvector &dir, float ra
 //--------------------------------------------------------------------------------
 BOOL CObjectSpace::RayPick	( const Fvector &start, const Fvector &dir, float range, rq_target tgt, rq_result& R, CObject* ignore_object)
 {
-	Lock.Enter		();
+    lock.Enter		();
 	BOOL	_res	= _RayPick(start,dir,range,tgt,R,ignore_object);
 	r_spatial.clear	();
-	Lock.Leave		();
+    lock.Leave		();
 	return	_res;
 }
 BOOL CObjectSpace::_RayPick	( const Fvector &start, const Fvector &dir, float range, rq_target tgt, rq_result& R, CObject* ignore_object)
@@ -154,10 +154,10 @@ BOOL CObjectSpace::_RayPick	( const Fvector &start, const Fvector &dir, float ra
 //--------------------------------------------------------------------------------
 BOOL CObjectSpace::RayQuery		(collide::rq_results& dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
 {
-	Lock.Enter					();
+    lock.Enter					();
 	BOOL						_res = _RayQuery2(dest,R,CB,user_data,tb,ignore_object);
 	r_spatial.clear_not_free	();
-	Lock.Leave					();
+    lock.Leave					();
 	return						(_res);
 }
 BOOL CObjectSpace::_RayQuery2	(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)