diff --git a/src/deh_soc.c b/src/deh_soc.c index c3b1ff5a2..1127229c3 100644 --- a/src/deh_soc.c +++ b/src/deh_soc.c @@ -2063,6 +2063,17 @@ static void readmenuitem(MYFILE *f, menuitem_t *menuitem) } else if (fastcmp(word, "SUBMENU")) { +#ifndef HAVE_DISCORDRPC + { + const char *testname = word2; + if (fastncmp("MN_", testname, 3)) + testname += 3; + if (fastcmp(testname, "OP_DISCORD") || fastcmp(testname, "MISC_DISCORDREQUESTS")) + { + continue; + } + } +#endif menutype_t mn = get_menutype(word2); if (mn == MAXMENUTYPES) { diff --git a/src/dehacked.c b/src/dehacked.c index 8a3c67656..ffbfcfb91 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -675,6 +675,18 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile) continue; // dedis don't need menus, silly! } +#ifndef HAVE_DISCORDRPC + { + const char *testname = word2; + if (fastncmp("MN_", testname, 3)) + testname += 3; + if (fastcmp(testname, "OP_DISCORD") || fastcmp(testname, "MISC_DISCORDREQUESTS")) + { + ignoremenulines(f); + continue; + } + } +#endif if (i == 0 && word2[0] != '0') // If word2 isn't a number i = get_menutype(word2); // find a huditem by name if (i >= 1 && i < nummenutypes)