diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2017-08-22 21:24:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-08-22 21:24:22 +0200 |
| commit | 4ee16fb536177cdedcb435a59cb625490f5ec69f (patch) | |
| tree | 1078219e5325d9e82ba278166ed13c721981d45a | |
| parent | e56c4f40d402651a05e3df1337e143b610758c1d (diff) | |
Core/Scripts: FOR_SCRIPTS macro shouldn't return early (#20187)
FOR_SCRIPTS, insteadof FOR_SCRIPTS_RET, shouldn't return
otherwise methods such as void ScriptMgr::OnPlayerEnterMap(Map* map, Player* player) will end prematurely
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index cfc64b83005..7d678656079 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -955,11 +955,9 @@ private: // Utility macros for looping over scripts. #define FOR_SCRIPTS(T, C, E) \ - if (SCR_REG_LST(T).empty()) \ - return; \ - \ - for (SCR_REG_ITR(T) C = SCR_REG_LST(T).begin(); \ - C != SCR_REG_LST(T).end(); ++C) + if (!SCR_REG_LST(T).empty()) \ + for (SCR_REG_ITR(T) C = SCR_REG_LST(T).begin(); \ + C != SCR_REG_LST(T).end(); ++C) #define FOR_SCRIPTS_RET(T, C, E, R) \ if (SCR_REG_LST(T).empty()) \ |