Skip to content

Commit 9696985

Browse files
committed
xr_3da: now build on linux
1 parent cb81c5e commit 9696985

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/xrCDB/xr_area.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ CObjectSpace::~CObjectSpace()
4141
// sh_debug.destroy ();
4242
xr_delete(m_pRender);
4343
#endif
44-
delete lock;
44+
delete lock;
4545
}
4646
//----------------------------------------------------------------------
4747

@@ -75,14 +75,14 @@ int CObjectSpace::GetNearest(xr_vector<ISpatial*>& q_spatial, xr_vector<IGameObj
7575
}
7676

7777
//----------------------------------------------------------------------
78-
IC int CObjectSpace::GetNearest(
78+
int CObjectSpace::GetNearest(
7979
xr_vector<IGameObject*>& q_nearest, const Fvector& point, float range, IGameObject* ignore_object)
8080
{
8181
return (GetNearest(r_spatial, q_nearest, point, range, ignore_object));
8282
}
8383

8484
//----------------------------------------------------------------------
85-
IC int CObjectSpace::GetNearest(xr_vector<IGameObject*>& q_nearest, ICollisionForm* obj, float range)
85+
int CObjectSpace::GetNearest(xr_vector<IGameObject*>& q_nearest, ICollisionForm* obj, float range)
8686
{
8787
IGameObject* O = obj->Owner();
8888
return GetNearest(q_nearest, O->GetSpatialData().sphere.P, range + O->GetSpatialData().sphere.R, O);

src/xr_3da/entry_point.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
7979

8080
try
8181
{
82-
char* commandLine = NULL;
82+
char* commandLine = "";
8383
int i;
8484
if(argc > 1)
8585
{

0 commit comments

Comments
 (0)