From bccf27ed6ade1589d62e8fed2aae90bc3e1a8d75 Mon Sep 17 00:00:00 2001 From: mq1n Date: Tue, 2 Sep 2025 20:30:12 +0300 Subject: [PATCH] refactor arena iteration in AddArena To solve: /home/test/m2dev-server-src/src/game/arena.cpp:83:75: error: comparison between pointer and integer ('CArena *' and 'bool') 83 | if ((CArena*)(*iter)->CheckArea(startA_X, startA_Y, startB_X, startB_Y) == false) --- src/game/arena.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/game/arena.cpp b/src/game/arena.cpp index 8ae4ce0..b335657 100644 --- a/src/game/arena.cpp +++ b/src/game/arena.cpp @@ -76,11 +76,9 @@ bool CArenaManager::AddArena(DWORD mapIdx, WORD startA_X, WORD startA_Y, WORD st bool CArenaMap::AddArena(DWORD mapIdx, WORD startA_X, WORD startA_Y, WORD startB_X, WORD startB_Y) { - itertype(m_listArena) iter = m_listArena.begin(); - - for (; iter != m_listArena.end(); iter++) + for (const auto& arena : m_listArena) { - if ((CArena*)(*iter)->CheckArea(startA_X, startA_Y, startB_X, startB_Y) == false) + if (arena->CheckArea(startA_X, startA_Y, startB_X, startB_Y) == false) { sys_log(0, "CArenaMap::AddArena - Same Start Position set. stA(%d, %d) stB(%d, %d)", startA_X, startA_Y, startB_X, startB_Y); return false;