Skip to content

Commit ac3b38d

Browse files
author
nitrocaster
committed
xrCDB: rename CObjectSpace::Lock -> CObjectSpace::lock.
1 parent bfd8375 commit ac3b38d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/xrCDB/xr_area.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class XRCDB_API CObjectSpace
2323
{
2424
private:
2525
// Debug
26-
Lock Lock;
26+
Lock lock;
2727
CDB::MODEL Static;
2828
Fbox m_BoundingVolume;
2929
xrXRC xrc; // MT: dangerous

src/xrCDB/xr_area_raypick.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ using namespace collide;
2323
//--------------------------------------------------------------------------------
2424
BOOL CObjectSpace::RayTest ( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object)
2525
{
26-
Lock.Enter ();
26+
lock.Enter ();
2727
BOOL _ret = _RayTest(start,dir,range,tgt,cache,ignore_object);
2828
r_spatial.clear ();
29-
Lock.Leave ();
29+
lock.Leave ();
3030
return _ret;
3131
}
3232
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
100100
//--------------------------------------------------------------------------------
101101
BOOL CObjectSpace::RayPick ( const Fvector &start, const Fvector &dir, float range, rq_target tgt, rq_result& R, CObject* ignore_object)
102102
{
103-
Lock.Enter ();
103+
lock.Enter ();
104104
BOOL _res = _RayPick(start,dir,range,tgt,R,ignore_object);
105105
r_spatial.clear ();
106-
Lock.Leave ();
106+
lock.Leave ();
107107
return _res;
108108
}
109109
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
154154
//--------------------------------------------------------------------------------
155155
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)
156156
{
157-
Lock.Enter ();
157+
lock.Enter ();
158158
BOOL _res = _RayQuery2(dest,R,CB,user_data,tb,ignore_object);
159159
r_spatial.clear_not_free ();
160-
Lock.Leave ();
160+
lock.Leave ();
161161
return (_res);
162162
}
163163
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)

0 commit comments

Comments
 (0)