xr_3da: now build on linux

OpenXRay · Jul 31, 2018 · 9696985 · 9696985
1 parent cb81c5e
commit 9696985
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/xrCDB/xr_area.cpp b/src/xrCDB/xr_area.cpp
@@ -41,7 +41,7 @@ CObjectSpace::~CObjectSpace()
     // sh_debug.destroy			();
     xr_delete(m_pRender);
 #endif
-	delete lock;
+    delete lock;
 }
 //----------------------------------------------------------------------
 
@@ -75,14 +75,14 @@ int CObjectSpace::GetNearest(xr_vector<ISpatial*>& q_spatial, xr_vector<IGameObj
 }
 
 //----------------------------------------------------------------------
-IC int CObjectSpace::GetNearest(
+int CObjectSpace::GetNearest(
     xr_vector<IGameObject*>& q_nearest, const Fvector& point, float range, IGameObject* ignore_object)
 {
     return (GetNearest(r_spatial, q_nearest, point, range, ignore_object));
 }
 
 //----------------------------------------------------------------------
-IC int CObjectSpace::GetNearest(xr_vector<IGameObject*>& q_nearest, ICollisionForm* obj, float range)
+int CObjectSpace::GetNearest(xr_vector<IGameObject*>& q_nearest, ICollisionForm* obj, float range)
 {
     IGameObject* O = obj->Owner();
     return GetNearest(q_nearest, O->GetSpatialData().sphere.P, range + O->GetSpatialData().sphere.R, O);

diff --git a/src/xr_3da/entry_point.cpp b/src/xr_3da/entry_point.cpp
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 
     try
     {
-        char* commandLine = NULL;
+        char* commandLine = "";
         int i;
         if(argc > 1)
         {