#include "cmd/cmd-diary.h"
#include "cmd/cmd-draw.h"
#include "cmd/cmd-dump.h"
+#include "cmd/cmd-knowledge.h"
#include "cmd/cmd-help.h"
#include "cmd/cmd-item.h"
#include "cmd/cmd-macro.h"
+#include "cmd/cmd-process-screen.h"
#include "cmd/cmd-smith.h"
#include "cmd/cmd-visuals.h"
#include "cmd/cmd-zapwand.h"
#include "player/race-info-table.h"
#include "mind.h"
#include "world.h"
-#include "objectkind.h"
-#include "autopick.h"
+#include "object/object-kind.h"
+#include "autopick/autopick.h"
+#include "autopick/autopick-pref-processor.h"
#include "floor-town.h"
#include "japanese.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
#include "wild.h"
#define MIN_STOCK 12
case '@':
{
client_ptr->town_num = old_town_num;
- do_cmd_macros(client_ptr);
+ do_cmd_macros(client_ptr, process_autopick_file_command);
client_ptr->town_num = inner_town_num;
break;
}
case '%':
{
client_ptr->town_num = old_town_num;
- do_cmd_visuals(client_ptr);
+ do_cmd_visuals(client_ptr, process_autopick_file_command);
client_ptr->town_num = inner_town_num;
break;
}
case '&':
{
client_ptr->town_num = old_town_num;
- do_cmd_colors(client_ptr);
+ do_cmd_colors(client_ptr, process_autopick_file_command);
client_ptr->town_num = inner_town_num;
break;
}
}
case ')':
{
- do_cmd_save_screen(client_ptr);
+ do_cmd_save_screen(client_ptr, handle_stuff, process_autopick_file_command);
break;
}
default: