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()
686
686
687
687
m_DemoFile.Close ();
688
688
689
- g_ClientDLL->OnDemoRecordStop ();
689
+ if ( g_ClientDLL ) g_ClientDLL->OnDemoRecordStop ();
690
690
}
691
691
692
692
m_bCloseDemoFile = false ;
Original file line number Diff line number Diff line change @@ -50,29 +50,18 @@ csurface_t *CCollisionBSPData::GetSurfaceAtIndex( unsigned short surfaceIndex )
50
50
return &map_surfaces[surfaceIndex];
51
51
}
52
52
53
- #if TEST_TRACE_POOL
54
- CTSPool<TraceInfo_t> g_TraceInfoPool;
55
- #else
56
53
class CTraceInfoPool : public CTSList <TraceInfo_t *>
57
54
{
58
55
public:
59
56
CTraceInfoPool () = default ;
60
57
};
61
58
62
- CTraceInfoPool g_TraceInfoPool;
63
- #endif
59
+ TraceInfo_t g_TraceInfo;
64
60
65
61
TraceInfo_t *BeginTrace ()
66
62
{
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
+
76
65
if ( pTraceInfo->m_BrushCounters [0 ].Count () != GetCollisionBSPData ()->numbrushes + 1 )
77
66
{
78
67
memset ( pTraceInfo->m_Count , 0 , sizeof ( pTraceInfo->m_Count ) );
@@ -118,11 +107,6 @@ void EndTrace( TraceInfo_t *&pTraceInfo )
118
107
{
119
108
PopTraceVisits ( pTraceInfo );
120
109
Assert ( pTraceInfo->m_nCheckDepth == -1 );
121
- #if TEST_TRACE_POOL
122
- g_TraceInfoPool.PutObject ( pTraceInfo );
123
- #else
124
- g_TraceInfoPool.PushItem ( pTraceInfo );
125
- #endif
126
110
pTraceInfo = NULL ;
127
111
}
128
112
You can’t perform that action at this time.
0 commit comments