1 files changed, 6 insertions, 4 deletions

diff --git a/tests/Generating/Stubs.cpp b/tests/Generating/Stubs.cpp
index b9e171b97..0a9f431f4 100644
--- a/tests/Generating/Stubs.cpp
+++ b/tests/Generating/Stubs.cpp
@@ -85,21 +85,23 @@ extern "C" int luaopen_lxp(lua_State * a_LuaState)
 
 
 
-cBlockInfo::~cBlockInfo()
+void cBlockInfo::sHandlerDeleter::operator () (cBlockHandler * a_Handler)
 {
+	delete a_Handler;
 }
 
 
 
 
 
-void cBlockInfo::Initialize(cBlockInfo::cBlockInfoArray & a_BlockInfos)
+cBlockInfo::cBlockInfoArray::cBlockInfoArray()
 {
+	cBlockInfoArray & BlockInfos = *this;
 	// The piece-loading code uses the handlers for rotations, so we need valid handlers
 	// Insert dummy handlers:
-	for (size_t i = 0; i < ARRAYCOUNT(a_BlockInfos); i++)
+	for (size_t i = 0; i < BlockInfos.size(); i++)
 	{
-		a_BlockInfos[i].m_Handler = new cBlockHandler(static_cast<BLOCKTYPE>(i));
+		BlockInfos[i].m_Handler.reset(new cBlockHandler(static_cast<BLOCKTYPE>(i)));
 	}
 }