Refactor: replace assert() to R_ASSERT()

Author: eagleivg

src/Layers/xrRender/NvTriStrip.cpp

@@ -123,7 +123,7 @@ void GenerateStrips(const u16* in_indices, const s32 in_numIndices, xr_vector<Pr
         stripifier.CreateStrips(tempStrips, stripIndices, bStitchStrips, numSeparateStrips);
 
         // if we're stitching strips together, we better get back only one strip from CreateStrips()
-        assert((bStitchStrips && (numSeparateStrips == 1)) || !bStitchStrips);
+        R_ASSERT((bStitchStrips && (numSeparateStrips == 1)) || !bStitchStrips);
 
         // convert to output format
         int numGroups = u16(numSeparateStrips); // for the strips

src/Layers/xrRender/NvTriStripObjects.cpp

@@ -34,7 +34,7 @@ NvEdgeInfo* NvStripifier::FindEdgeInfo(NvEdgeInfoVec& edgeInfos, int v0, int v1)
         }
         else
         {
-            assert(infoIter->m_v1 == v0);
+            R_ASSERT(infoIter->m_v1 == v0);
             if (infoIter->m_v0 == v1)
                 return infoIter;
             else
@@ -53,7 +53,7 @@ NvEdgeInfo* NvStripifier::FindEdgeInfo(NvEdgeInfoVec& edgeInfos, int v0, int v1)
 NvFaceInfo* NvStripifier::FindOtherFace(NvEdgeInfoVec& edgeInfos, int v0, int v1, NvFaceInfo* faceInfo)
 {
     NvEdgeInfo* edgeInfo = FindEdgeInfo(edgeInfos, v0, v1);
-    assert(edgeInfo != NULL);
+    R_ASSERT(edgeInfo != NULL);
     return (edgeInfo->m_face0 == faceInfo ? edgeInfo->m_face1 : edgeInfo->m_face0);
 }
 
@@ -315,7 +315,7 @@ int NvStripifier::GetSharedVertex(NvFaceInfo* faceA, NvFaceInfo* faceB)
 IC int NvStripifier::GetNextIndex(const WordVec& indices, NvFaceInfo* face)
 {
     int numIndices = indices.size();
-    assert(numIndices >= 2);
+    R_ASSERT(numIndices >= 2);
 
     int v0 = indices[numIndices - 2];
     int v1 = indices[numIndices - 1];
@@ -376,15 +376,15 @@ IC bool NvStripInfo::IsMarked(NvFaceInfo* faceInfo)
 //
 IC void NvStripInfo::MarkTriangle(NvFaceInfo* faceInfo)
 {
-    assert(!IsMarked(faceInfo));
+    R_ASSERT(!IsMarked(faceInfo));
     if (IsExperiment())
     {
         faceInfo->m_experimentId = m_experimentId;
         faceInfo->m_testStripId = m_stripId;
     }
     else
     {
-        assert(faceInfo->m_stripId == -1);
+        R_ASSERT(faceInfo->m_stripId == -1);
         faceInfo->m_experimentId = -1;
         faceInfo->m_stripId = m_stripId;
     }
@@ -743,11 +743,11 @@ bool NvStripifier::IsCW(NvFaceInfo* faceInfo, int v0, int v1)
 void NvStripifier::CreateStrips(
     const NvStripInfoVec& allStrips, IntVec& stripIndices, const bool bStitchStrips, unsigned int& numSeparateStrips)
 {
-    assert(numSeparateStrips == 0);
+    R_ASSERT(numSeparateStrips == 0);
 
     NvFaceInfo tLastFace(0, 0, 0);
     int nStripCount = allStrips.size();
-    assert(nStripCount > 0);
+    R_ASSERT(nStripCount > 0);
 
     // we infer the cw/ccw ordering depending on the number of indices
     // this is screwed up by the fact that we insert -1s to denote changing strips
@@ -758,7 +758,7 @@ void NvStripifier::CreateStrips(
     {
         NvStripInfo* strip = allStrips[i];
         int nStripFaceCount = strip->m_faces.size();
-        assert(nStripFaceCount > 0);
+        R_ASSERT(nStripFaceCount > 0);
 
         // Handle the first face in the strip
         {
@@ -1228,7 +1228,7 @@ void NvStripifier::FindAllStrips(
             resetPoints.insert(nextFace);
 
             // otherwise, we shall now try experiments for starting on the 01,12, and 20 edges
-            assert(nextFace->m_stripId < 0);
+            R_ASSERT(nextFace->m_stripId < 0);
 
             // build the strip off of this face's 0-1 edge
             NvEdgeInfo* edge01 = FindEdgeInfo(allEdgeInfos, nextFace->m_v0, nextFace->m_v1);

src/utils/xrQSlim/src/MxPropSlim.cpp

@@ -342,7 +342,7 @@ unsigned int MxPropSlim::check_local_validity(unsigned int v, const float* vnew)
             mxv_cross3(n, f_n, d_yx); // n = ((y-x)^(v-x))^(y-x)
             mxv_unitize(n, 3);
 
-            // assert( mxv_dot(d_vx, n, 3) > -FEQ_EPS );
+            // R_ASSERT( mxv_dot(d_vx, n, 3) > -FEQ_EPS );
             if (mxv_dot(d_vnew, n, 3) < local_validity_threshold * mxv_dot(d_vx, n, 3))
                 nfailed++;
         }

src/utils/xrQSlim/src/MxQSlim.cpp

@@ -226,7 +226,7 @@ unsigned int MxEdgeQSlim::check_local_validity(unsigned int v1, unsigned int /*v
             mxv_cross3(n, f_n, d_yx); // n = ((y-x)^(v-x))^(y-x)
             mxv_unitize(n, 3);
 
-            // assert( mxv_dot(d_vx, n, 3) > -FEQ_EPS );
+            // R_ASSERT( mxv_dot(d_vx, n, 3) > -FEQ_EPS );
             if (mxv_dot(d_vnew, n, 3) < local_validity_threshold * mxv_dot(d_vx, n, 3))
                 nfailed++;
         }

src/xrCore/Compression/Coder.hpp

@@ -32,7 +32,7 @@ class RangeCoder
                                }
 
  void Encode (uint cumFreq, uint freq, uint totFreq) {
-    assert(cumFreq+freq<totFreq && freq && totFreq<=BOT);
+    R_ASSERT(cumFreq+freq<totFreq && freq && totFreq<=BOT);
     low  += cumFreq * (range/= totFreq);
     range*= freq;
     while ((low ^ low+range)<TOP || range<BOT && ((range= -low & BOT-1),1))
@@ -46,7 +46,7 @@ class RangeCoder
  }
 
  void Decode (uint cumFreq, uint freq, uint totFreq) {
-    assert(cumFreq+freq<totFreq && freq && totFreq<=BOT);
+    R_ASSERT(cumFreq+freq<totFreq && freq && totFreq<=BOT);
     low  += cumFreq*range;
     range*= freq;
     while ((low ^ low+range)<TOP || range<BOT && ((range= -low & BOT-1),1))

src/xrGame/Level.cpp

@@ -441,7 +441,7 @@ void CLevel::OnFrame()
     {
         if (g_mt_config.test(mtMap))
         {
-            assert(m_map_manager);
+            R_ASSERT(m_map_manager);
             Device.seqParallel.push_back(fastdelegate::FastDelegate0<>(m_map_manager, &CMapManager::Update));
         }
         else
@@ -552,7 +552,7 @@ void CLevel::OnFrame()
     {
         if (g_mt_config.test(mtLevelSounds))
         {
-            assert(m_level_sound_manager);
+            R_ASSERT(m_level_sound_manager);
             Device.seqParallel.push_back(
                 fastdelegate::FastDelegate0<>(m_level_sound_manager, &CLevelSoundManager::Update));
         }

src/xrGame/ui/UIPdaWnd.cpp

@@ -165,7 +165,7 @@ void CUIPdaWnd::Update()
     m_clock->TextItemControl().SetText(
         InventoryUtilities::GetGameTimeAsString(InventoryUtilities::etpTimeToMinutes).c_str());
 
-    assert(pUILogsWnd);
+    R_ASSERT(pUILogsWnd);
     Device.seqParallel.push_back(fastdelegate::FastDelegate0<>(pUILogsWnd, &CUILogsWnd::PerformWork));
 }