fix bugs in nominations_extended from last commits

This commit is contained in:
BotoX 2019-12-02 23:32:55 +01:00
parent 2699dc0824
commit ca37ab2a84

View File

@ -857,28 +857,24 @@ public int Handler_MapSelectMenu(Menu menu, MenuAction action, int param1, int p
GetMenuItem(menu, param2, map, sizeof(map)); GetMenuItem(menu, param2, map, sizeof(map));
int status; int status;
if(GetTrieValue(g_mapTrie, map, status))
if(!GetTrieValue(g_mapTrie, map, status))
{ {
LogError("Menu selection of item not in trie. Major logic problem somewhere."); if((status & MAPSTATUS_DISABLED) == MAPSTATUS_DISABLED)
return ITEMDRAW_DEFAULT;
}
if((status & MAPSTATUS_DISABLED) == MAPSTATUS_DISABLED)
{
if((status & MAPSTATUS_EXCLUDE_CURRENT) == MAPSTATUS_EXCLUDE_CURRENT)
{ {
return ITEMDRAW_DISABLED; if((status & MAPSTATUS_EXCLUDE_CURRENT) == MAPSTATUS_EXCLUDE_CURRENT)
} {
return ITEMDRAW_DISABLED;
}
if(AreRestrictionsActive() && (status & MAPSTATUS_EXCLUDE_PREVIOUS) == MAPSTATUS_EXCLUDE_PREVIOUS) if(AreRestrictionsActive() && (status & MAPSTATUS_EXCLUDE_PREVIOUS) == MAPSTATUS_EXCLUDE_PREVIOUS)
{ {
return ITEMDRAW_DISABLED; return ITEMDRAW_DISABLED;
} }
if((status & MAPSTATUS_EXCLUDE_NOMINATED) == MAPSTATUS_EXCLUDE_NOMINATED) if((status & MAPSTATUS_EXCLUDE_NOMINATED) == MAPSTATUS_EXCLUDE_NOMINATED)
{ {
return ITEMDRAW_DISABLED; return ITEMDRAW_DISABLED;
}
} }
} }