File tree Expand file tree Collapse file tree 2 files changed +4
-20
lines changed Expand file tree Collapse file tree 2 files changed +4
-20
lines changed Original file line number Diff line number Diff line change @@ -686,7 +686,7 @@ void CDemoRecorder::CloseDemoFile()
686686
687687 m_DemoFile.Close ();
688688
689- g_ClientDLL->OnDemoRecordStop ();
689+ if ( g_ClientDLL ) g_ClientDLL->OnDemoRecordStop ();
690690 }
691691
692692 m_bCloseDemoFile = false ;
Original file line number Diff line number Diff line change @@ -50,29 +50,18 @@ csurface_t *CCollisionBSPData::GetSurfaceAtIndex( unsigned short surfaceIndex )
5050 return &map_surfaces[surfaceIndex];
5151}
5252
53- #if TEST_TRACE_POOL
54- CTSPool<TraceInfo_t> g_TraceInfoPool;
55- #else
5653class CTraceInfoPool : public CTSList <TraceInfo_t *>
5754{
5855public:
5956 CTraceInfoPool () = default ;
6057};
6158
62- CTraceInfoPool g_TraceInfoPool;
63- #endif
59+ TraceInfo_t g_TraceInfo;
6460
6561TraceInfo_t *BeginTrace ()
6662{
67- #if TEST_TRACE_POOL
68- TraceInfo_t *pTraceInfo = g_TraceInfoPool.GetObject ();
69- #else
70- TraceInfo_t *pTraceInfo;
71- if ( !g_TraceInfoPool.PopItem ( &pTraceInfo ) )
72- {
73- pTraceInfo = new TraceInfo_t;
74- }
75- #endif
63+ TraceInfo_t * pTraceInfo = &g_TraceInfo;
64+
7665 if ( pTraceInfo->m_BrushCounters [0 ].Count () != GetCollisionBSPData ()->numbrushes + 1 )
7766 {
7867 memset ( pTraceInfo->m_Count , 0 , sizeof ( pTraceInfo->m_Count ) );
@@ -118,11 +107,6 @@ void EndTrace( TraceInfo_t *&pTraceInfo )
118107{
119108 PopTraceVisits ( pTraceInfo );
120109 Assert ( pTraceInfo->m_nCheckDepth == -1 );
121- #if TEST_TRACE_POOL
122- g_TraceInfoPool.PutObject ( pTraceInfo );
123- #else
124- g_TraceInfoPool.PushItem ( pTraceInfo );
125- #endif
126110 pTraceInfo = NULL ;
127111}
128112
You can’t perform that action at this time.
0 commit comments