Skip to content

Commit 7e92595

Browse files
committed
Revert "Add high-performance, carefully engineered allocator (Addendum to 5dc09d9)" for now (Clean-up is underway)
1 parent 50be993 commit 7e92595

File tree

7 files changed

+265
-1258
lines changed

7 files changed

+265
-1258
lines changed

Client/core/CSettings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,6 @@ void CSettings::CreateGUI()
11491149
m_pDebugSettingCombo->AddItem("#0000 Lua trace")->SetData((void*)EDiagnosticDebug::LUA_TRACE_0000);
11501150
m_pDebugSettingCombo->AddItem("#0000 Resize always")->SetData((void*)EDiagnosticDebug::RESIZE_ALWAYS_0000);
11511151
m_pDebugSettingCombo->AddItem("#0000 Resize never")->SetData((void*)EDiagnosticDebug::RESIZE_NEVER_0000);
1152-
m_pDebugSettingCombo->AddItem("#0000 Memory allocation debug")->SetData((void*)EDiagnosticDebug::BAD_ALLOC);
11531152
m_pDebugSettingCombo->SetReadOnly(true);
11541153
vecTemp.fY += fLineHeight;
11551154

Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,8 +1773,6 @@ int CLuaDrawingDefs::DxGetStatus(lua_State* luaVM)
17731773
return "#0000 Resize always";
17741774
case EDiagnosticDebug::RESIZE_NEVER_0000:
17751775
return "#0000 Resize never";
1776-
case EDiagnosticDebug::BAD_ALLOC:
1777-
return "#0000 Memory allocation debug";
17781776
default:
17791777
return "Default";
17801778
}

Client/multiplayer_sa/CMemoryAllocatorDiagnostics.cpp

Lines changed: 0 additions & 441 deletions
This file was deleted.

Client/multiplayer_sa/CMemoryAllocatorDiagnostics.h

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)