Subtle bug with indexes on two different arrays caused strange recommendations for non-admins.

This commit is contained in:
Thomas Arp
2011-01-17 21:47:27 +00:00
parent 9b89362289
commit 6c2252ce89

View File

@@ -486,15 +486,15 @@ void sort_commands(void)
/* Returns TRUE if 'ch' has sufficient access to use the command 'cmd' */ /* Returns TRUE if 'ch' has sufficient access to use the command 'cmd' */
bool can_use_command(struct char_data *ch, int cmd) bool can_use_command(struct char_data *ch, int cmd)
{ {
if (complete_cmd_info[cmd].admin_flag == ADM_NONE && if (cmd_info[cmd].admin_flag == ADM_NONE &&
complete_cmd_info[cmd].minimum_admlevel == ADMLVL_MORTAL && cmd_info[cmd].minimum_admlevel == ADMLVL_MORTAL &&
GET_LEVEL(ch) >= complete_cmd_info[cmd].minimum_level) GET_LEVEL(ch) >= cmd_info[cmd].minimum_level)
return TRUE; return TRUE;
if (complete_cmd_info[cmd].admin_flag == ADM_NONE && GET_ADMLEVEL(ch) >= complete_cmd_info[cmd].minimum_admlevel) if (cmd_info[cmd].admin_flag == ADM_NONE && GET_ADMLEVEL(ch) >= cmd_info[cmd].minimum_admlevel)
return TRUE; return TRUE;
if (complete_cmd_info[cmd].admin_flag != ADM_NONE && ADM_FLAGGED(ch, complete_cmd_info[cmd].admin_flag)) if (cmd_info[cmd].admin_flag != ADM_NONE && ADM_FLAGGED(ch, cmd_info[cmd].admin_flag))
return TRUE; return TRUE;
return FALSE; return FALSE;