diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/inspircd_io.h | 4 | ||||
| -rw-r--r-- | include/modules.h | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/inspircd_io.h b/include/inspircd_io.h index 86ab543a5..5319f8c59 100644 --- a/include/inspircd_io.h +++ b/include/inspircd_io.h @@ -255,6 +255,10 @@ class ServerConfig : public classbase */ char implement_lists[255][255]; + /** Global implementation list + */ + char global_implementation[255]; + /** A list of ports claimed by IO Modules */ std::map<int,Module*> IOHookModule; diff --git a/include/modules.h b/include/modules.h index 264354db9..460cc6566 100644 --- a/include/modules.h +++ b/include/modules.h @@ -80,10 +80,12 @@ typedef std::deque<userrec*> chanuserlist; // loaded modules in a readable simple way, e.g.: // 'FOREACH_MOD OnConnect(user);' -#define FOREACH_MOD(y,x) for (int _i = 0; _i <= MODCOUNT; _i++) { \ +#define FOREACH_MOD(y,x) if (Config->global_implementation[y] > 0) { \ + for (int _i = 0; _i <= MODCOUNT; _i++) { \ if (Config->implement_lists[_i][y]) \ modules[_i]->x ; \ - } + } \ + } // This define is similar to the one above but returns a result in MOD_RESULT. // The first module to return a nonzero result is the value to be accepted, @@ -91,7 +93,8 @@ typedef std::deque<userrec*> chanuserlist; // ********************************************************************************************* -#define FOREACH_RESULT(y,x) { MOD_RESULT = 0; \ +#define FOREACH_RESULT(y,x) { if (Config->global_implementation[y] > 0) { \ + MOD_RESULT = 0; \ for (int _i = 0; _i <= MODCOUNT; _i++) { \ if (Config->implement_lists[_i][y]) {\ int res = modules[_i]->x ; \ @@ -101,7 +104,8 @@ typedef std::deque<userrec*> chanuserlist; } \ } \ } \ - } + } \ + } // ********************************************************************************************* |