Skip to content

Commit 2b13b09

Browse files
committed
Prettify CLuaMain destructor iteration
1 parent 70ef2e4 commit 2b13b09

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

Client/mods/deathmatch/logic/lua/CLuaMain.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,10 @@ CLuaMain::~CLuaMain()
5757

5858
// Delete the timer manager
5959
delete m_pLuaTimerManager;
60-
61-
list<CXMLNode*>::iterator iterXMLNodes = m_XMLNodes.begin();
62-
for (; iterXMLNodes != m_XMLNodes.end(); ++iterXMLNodes)
60+
61+
for (auto& xmlNode : m_XMLNodes)
6362
{
64-
delete *iterXMLNodes;
63+
delete xmlNode;
6564
}
6665

6766
CClientPerfStatLuaMemory::GetSingleton()->OnLuaMainDestroy(this);

Server/mods/deathmatch/logic/lua/CLuaMain.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,14 @@ CLuaMain::~CLuaMain()
7272
delete m_pLuaTimerManager;
7373

7474
// Eventually delete the XML files the LUA script didn't
75-
list<CXMLFile*>::iterator iterXMLFiles = m_XMLFiles.begin();
76-
for (; iterXMLFiles != m_XMLFiles.end(); ++iterXMLFiles)
75+
for (auto& xmlFile : m_XMLFiles)
7776
{
78-
delete *iterXMLFiles;
77+
delete xmlFile;
7978
}
8079

81-
list<CXMLNode*>::iterator iterXMLNodes = m_XMLNodes.begin();
82-
for (; iterXMLNodes != m_XMLNodes.end(); ++iterXMLNodes)
80+
for (auto& xmlNode : m_XMLNodes)
8381
{
84-
delete *iterXMLNodes;
82+
delete xmlNode;
8583
}
8684

8785
// Eventually delete the text displays the LUA script didn't

0 commit comments

Comments
 (0)