metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor arena iteration in AddArena

Browse Source 
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)
This commit is contained in:
mq1n
2025-09-02 20:30:12 +03:00
parent b2f39b365f
commit bccf27ed6a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/arena.cpp
View File

@@ -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) 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 (const auto& arena : m_listArena)
for (; iter != m_listArena.end(); iter++)
{ {
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); 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; return false;