Changeset 123
- Timestamp:
- 05/07/07 18:27:22 (2 years ago)
- Files:
-
- trunk/src/defines.h (modified) (2 diffs)
- trunk/src/object1.c (modified) (3 diffs)
- trunk/src/tables.c (modified) (5 diffs)
- trunk/src/xtra2.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/defines.h
r119 r123 2441 2441 #define OPT_easy_open 64 2442 2442 #define OPT_easy_alter 65 2443 #define OPT_easy_floor 662444 2443 #define OPT_show_piles 67 2445 2444 #define OPT_center_player 68 … … 2537 2536 #define easy_open op_ptr->opt[OPT_easy_open] 2538 2537 #define easy_alter op_ptr->opt[OPT_easy_alter] 2539 #define easy_floor op_ptr->opt[OPT_easy_floor]2540 2538 #define show_piles op_ptr->opt[OPT_show_piles] 2541 2539 #define center_player op_ptr->opt[OPT_center_player] trunk/src/object1.c
r120 r123 2714 2714 * or a warning message, if appropriate, if no items are available. 2715 2715 * 2716 * Note that the "easy_floor" option affects this function in several ways.2717 *2718 2716 * Note that only "acceptable" floor objects get indexes, so between two 2719 2717 * commands, the indexes of floor objects may change. XXX XXX XXX … … 2876 2874 2877 2875 /* Use floor if allowed */ 2878 else if ( easy_floor)2876 else if (use_floor) 2879 2877 { 2880 2878 p_ptr->command_wrk = (USE_FLOOR); … … 3115 3113 } 3116 3114 3117 if (easy_floor) 3115 /* There is only one item */ 3116 if (floor_num == 1) 3118 3117 { 3119 /* There is only one item*/3120 if ( floor_num == 1)3118 /* Auto-select */ 3119 if (p_ptr->command_wrk == (USE_FLOOR)) 3121 3120 { 3122 /* Hack -- Auto-Select */ 3123 if (p_ptr->command_wrk == (USE_FLOOR)) 3121 /* Special index */ 3122 k = 0 - floor_list[0]; 3123 3124 /* Allow player to "refuse" certain actions */ 3125 if (!get_item_allow(k)) 3124 3126 { 3125 /* Special index */3126 k = 0 - floor_list[0];3127 3128 /* Allow player to "refuse" certain actions */3129 if (!get_item_allow(k))3130 {3131 done = TRUE;3132 break;3133 }3134 3135 /* Accept that choice */3136 (*cp) = k;3137 item = TRUE;3138 3127 done = TRUE; 3139 3140 3128 break; 3141 3129 } 3130 3131 /* Accept that choice */ 3132 (*cp) = k; 3133 item = TRUE; 3134 done = TRUE; 3135 3136 break; 3142 3137 } 3143 3138 trunk/src/tables.c
r119 r123 1463 1463 "easy_open", /* OPT_easy_open */ 1464 1464 "easy_alter", /* OPT_easy_alter */ 1465 "easy_floor", /* OPT_easy_floor */1465 NULL, /* xxx easy_floor */ 1466 1466 "show_piles", /* OPT_show_piles */ 1467 1467 "center_player", /* OPT_center_player */ … … 1727 1727 "Open/Disarm/Close without direction", /* OPT_easy_open */ 1728 1728 "Open/Disarm doors/traps on movement", /* OPT_easy_alter */ 1729 "Display floor stacks in a list", /* OPT_easy_floor */1729 NULL, /* xxx easy_floor */ 1730 1730 "Show stacks using special attr/char", /* OPT_show_piles */ 1731 1731 "Center map continuously (very slow)", /* OPT_center_player */ … … 1991 1991 FALSE, /* OPT_easy_open */ 1992 1992 FALSE, /* OPT_easy_alter */ 1993 FALSE, /* OPT_easy_floor */1993 FALSE, /* xxx easy_floor */ 1994 1994 FALSE, /* OPT_show_piles */ 1995 1995 FALSE, /* OPT_center_player */ … … 2216 2216 /*** Pickup/Item ***/ 2217 2217 { 2218 OPT_easy_floor,2219 2218 OPT_always_pickup, 2220 2219 OPT_query_floor, … … 2224 2223 OPT_verify_destroy, 2225 2224 OPT_verify_special, 2225 OPT_NONE, 2226 2226 OPT_NONE, 2227 2227 OPT_NONE, trunk/src/xtra2.c
r119 r123 2616 2616 2617 2617 /* Scan all objects in the grid */ 2618 if (easy_floor)2619 2618 { 2620 2619 int floor_list[MAX_FLOOR_STACK]; … … 2628 2627 boring = FALSE; 2629 2628 2630 /* Floored */ 2631 floored = TRUE; 2632 2633 /* Describe */ 2634 while (1) 2629 /* If there is more than one item... */ 2630 if (floor_num > 1) while (1) 2635 2631 { 2632 floored = TRUE; 2633 2636 2634 /* Describe the pile */ 2637 2635 if (p_ptr->wizard)
