• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision427c46fd6bd1e971fe4bbb53420d427e3b2e056b (tree)
Time2019-06-15 19:27:46
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

Merge branch '#39076' into For2.2.2-Refactoring

Change Summary

Incremental Difference

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3781,7 +3781,6 @@ static bool research_mon(void)
37813781 /* Scan the monster memory */
37823782 while (notpicked)
37833783 {
3784- /* Extract a race */
37853784 r_idx = who[i];
37863785
37873786 /* Hack -- Begin the prompt */
@@ -3793,7 +3792,6 @@ static bool research_mon(void)
37933792 /* Interact */
37943793 while (1)
37953794 {
3796- /* Recall */
37973795 if (recall)
37983796 {
37993797 /*** Recall on screen ***/
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -353,7 +353,6 @@ void do_cmd_activate_aux(player_type *user_ptr, INVENTORY_IDX item)
353353 object_type *o_ptr;
354354 bool success;
355355
356-
357356 /* Get the item (in the pack) */
358357 if (item >= 0)
359358 {
@@ -368,7 +367,6 @@ void do_cmd_activate_aux(player_type *user_ptr, INVENTORY_IDX item)
368367
369368 take_turn(user_ptr, 100);
370369
371- /* Extract the item level */
372370 lev = k_info[o_ptr->k_idx].level;
373371
374372 /* Hack -- use artifact level instead */
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1440,7 +1440,6 @@ void do_cmd_query_symbol(void)
14401440 /* Scan the monster memory */
14411441 while (1)
14421442 {
1443- /* Extract a race */
14441443 r_idx = who[i];
14451444
14461445 /* Hack -- Auto-recall */
@@ -1450,7 +1449,6 @@ void do_cmd_query_symbol(void)
14501449 /* Interact */
14511450 while (1)
14521451 {
1453- /* Recall */
14541452 if (recall)
14551453 {
14561454 screen_save();
@@ -1546,73 +1544,45 @@ void do_cmd_use(void)
15461544
15471545 switch (o_ptr->tval)
15481546 {
1549- /* Spike a door */
15501547 case TV_SPIKE:
1551- {
15521548 do_cmd_spike();
15531549 break;
1554- }
15551550
1556- /* Eat some food */
15571551 case TV_FOOD:
1558- {
15591552 do_cmd_eat_food_aux(item);
15601553 break;
1561- }
15621554
1563- /* Aim a wand */
15641555 case TV_WAND:
1565- {
15661556 do_cmd_aim_wand_aux(item);
15671557 break;
1568- }
15691558
1570- /* Use a staff */
15711559 case TV_STAFF:
1572- {
15731560 do_cmd_use_staff_aux(item);
15741561 break;
1575- }
15761562
1577- /* Zap a rod */
15781563 case TV_ROD:
1579- {
15801564 do_cmd_zap_rod_aux(item);
15811565 break;
1582- }
15831566
1584- /* Quaff a potion */
15851567 case TV_POTION:
1586- {
15871568 do_cmd_quaff_potion_aux(item);
15881569 break;
1589- }
15901570
1591- /* Read a scroll */
15921571 case TV_SCROLL:
1593- {
15941572 if (cmd_limit_blind(p_ptr)) return;
15951573 if (cmd_limit_confused(p_ptr)) return;
1596-
15971574 do_cmd_read_scroll_aux(item, TRUE);
15981575 break;
1599- }
16001576
1601- /* Fire ammo */
16021577 case TV_SHOT:
16031578 case TV_ARROW:
16041579 case TV_BOLT:
1605- {
16061580 exe_fire(item, &p_ptr->inventory_list[INVEN_BOW], SP_NONE);
16071581 break;
1608- }
16091582
1610- /* Activate an artifact */
16111583 default:
1612- {
16131584 do_cmd_activate_aux(p_ptr, item);
16141585 break;
1615- }
16161586 }
16171587 }
16181588
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -313,7 +313,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
313313
314314 take_turn(p_ptr, 100);
315315
316- /* Extract the item level */
317316 lev = k_info[o_ptr->k_idx].level;
318317 if (lev > 50) lev = 50 + (lev - 50) / 2;
319318
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -312,7 +312,6 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item)
312312
313313 take_turn(p_ptr, 100);
314314
315- /* Extract the item level */
316315 lev = k_info[o_ptr->k_idx].level;
317316
318317 /* Base chance of success */
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -612,7 +612,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, concptr info)
612612 {
613613 char acount[10];
614614
615- /* Recall */
616615 if (recall)
617616 {
618617 screen_save();
Show on old repository browser