• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision19ac1aa0cc223e97c0a9145498e2d515c4a0fbef (tree)
Time2019-06-29 19:25:44
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #38997 gain_level_reward() に player_type * 引数を追加.

Change Summary

Incremental Difference

--- a/src/patron.c
+++ b/src/patron.c
@@ -238,7 +238,7 @@ const int chaos_rewards[MAX_PATRON][20] =
238238 };
239239
240240
241-void gain_level_reward(int chosen_reward)
241+void gain_level_reward(player_type *creature_ptr, int chosen_reward)
242242 {
243243 char wrath_reason[32] = "";
244244 int nasty_chance = 6;
@@ -251,14 +251,14 @@ void gain_level_reward(int chosen_reward)
251251
252252 if (!chosen_reward)
253253 {
254- if (p_ptr->suppress_multi_reward) return;
255- else p_ptr->suppress_multi_reward = TRUE;
254+ if (creature_ptr->suppress_multi_reward) return;
255+ else creature_ptr->suppress_multi_reward = TRUE;
256256 }
257257
258258
259- if (p_ptr->lev == 13) nasty_chance = 2;
260- else if (!(p_ptr->lev % 13)) nasty_chance = 3;
261- else if (!(p_ptr->lev % 14)) nasty_chance = 12;
259+ if (creature_ptr->lev == 13) nasty_chance = 2;
260+ else if (!(creature_ptr->lev % 13)) nasty_chance = 3;
261+ else if (!(creature_ptr->lev % 14)) nasty_chance = 12;
262262
263263 if (one_in_(nasty_chance))
264264 type = randint1(20); /* Allow the 'nasty' effects */
@@ -270,14 +270,14 @@ void gain_level_reward(int chosen_reward)
270270 type--;
271271
272272
273- sprintf(wrath_reason, _("%sの怒り", "the Wrath of %s"), chaos_patrons[p_ptr->chaos_patron]);
273+ sprintf(wrath_reason, _("%sの怒り", "the Wrath of %s"), chaos_patrons[creature_ptr->chaos_patron]);
274274
275- effect = chaos_rewards[p_ptr->chaos_patron][type];
275+ effect = chaos_rewards[creature_ptr->chaos_patron][type];
276276
277277 if (one_in_(6) && !chosen_reward)
278278 {
279- msg_format(_("%^sは褒美としてあなたを突然変異させた。", "%^s rewards you with a mutation!"), chaos_patrons[p_ptr->chaos_patron]);
280- (void)gain_mutation(p_ptr, 0);
279+ msg_format(_("%^sは褒美としてあなたを突然変異させた。", "%^s rewards you with a mutation!"), chaos_patrons[creature_ptr->chaos_patron]);
280+ (void)gain_mutation(creature_ptr, 0);
281281 reward = _("変異した。", "mutation");
282282 }
283283 else
@@ -287,93 +287,93 @@ void gain_level_reward(int chosen_reward)
287287
288288 case REW_POLY_SLF:
289289
290- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
290+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
291291 msg_print(_("「汝、新たなる姿を必要とせり!」", "'Thou needst a new form, mortal!'"));
292292
293- do_poly_self(p_ptr);
293+ do_poly_self(creature_ptr);
294294 reward = _("変異した。", "polymorphing");
295295 break;
296296
297297 case REW_GAIN_EXP:
298298
299- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
299+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
300300 msg_print(_("「汝は良く行いたり!続けよ!」", "'Well done, mortal! Lead on!'"));
301301
302- if (p_ptr->prace == RACE_ANDROID)
302+ if (creature_ptr->prace == RACE_ANDROID)
303303 {
304304 msg_print(_("しかし何も起こらなかった。", "But, nothing happen."));
305305 }
306- else if (p_ptr->exp < PY_MAX_EXP)
306+ else if (creature_ptr->exp < PY_MAX_EXP)
307307 {
308- s32b ee = (p_ptr->exp / 2) + 10;
308+ s32b ee = (creature_ptr->exp / 2) + 10;
309309 if (ee > 100000L) ee = 100000L;
310310 msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
311311
312- gain_exp(p_ptr, ee);
312+ gain_exp(creature_ptr, ee);
313313 reward = _("経験値を得た", "experience");
314314 }
315315 break;
316316
317317 case REW_LOSE_EXP:
318318
319- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
319+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
320320 msg_print(_("「下僕よ、汝それに値せず。」", "'Thou didst not deserve that, slave.'"));
321321
322- if (p_ptr->prace == RACE_ANDROID)
322+ if (creature_ptr->prace == RACE_ANDROID)
323323 {
324324 msg_print(_("しかし何も起こらなかった。", "But, nothing happen."));
325325 }
326326 else
327327 {
328- lose_exp(p_ptr, p_ptr->exp / 6);
328+ lose_exp(creature_ptr, creature_ptr->exp / 6);
329329 reward = _("経験値を失った。", "losing experience");
330330 }
331331 break;
332332
333333 case REW_GOOD_OBJ:
334- msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), chaos_patrons[p_ptr->chaos_patron]);
334+ msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), chaos_patrons[creature_ptr->chaos_patron]);
335335 msg_print(_("「我が与えし物を賢明に使うべし。」", "'Use my gift wisely.'"));
336336
337- acquirement(p_ptr->y, p_ptr->x, 1, FALSE, FALSE, FALSE);
337+ acquirement(creature_ptr->y, creature_ptr->x, 1, FALSE, FALSE, FALSE);
338338 reward = _("上質なアイテムを手に入れた。", "a good item");
339339 break;
340340
341341 case REW_GREA_OBJ:
342342
343- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
343+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
344344 msg_print(_("「我が与えし物を賢明に使うべし。」", "'Use my gift wisely.'"));
345345
346- acquirement(p_ptr->y, p_ptr->x, 1, TRUE, FALSE, FALSE);
346+ acquirement(creature_ptr->y, creature_ptr->x, 1, TRUE, FALSE, FALSE);
347347 reward = _("高級品のアイテムを手に入れた。", "an excellent item");
348348 break;
349349
350350 case REW_CHAOS_WP:
351- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
351+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
352352 msg_print(_("「汝の行いは貴き剣に値せり。」", "'Thy deed hath earned thee a worthy blade.'"));
353- acquire_chaos_weapon(p_ptr);
353+ acquire_chaos_weapon(creature_ptr);
354354 reward = _("(混沌)の武器を手に入れた。", "chaos weapon");
355355 break;
356356
357357 case REW_GOOD_OBS:
358358
359- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
359+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
360360 msg_print(_("「汝の行いは貴き報いに値せり。」", "'Thy deed hath earned thee a worthy reward.'"));
361361
362- acquirement(p_ptr->y, p_ptr->x, randint1(2) + 1, FALSE, FALSE, FALSE);
362+ acquirement(creature_ptr->y, creature_ptr->x, randint1(2) + 1, FALSE, FALSE, FALSE);
363363 reward = _("上質なアイテムを手に入れた。", "good items");
364364 break;
365365
366366 case REW_GREA_OBS:
367367
368- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
368+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
369369 msg_print(_("「下僕よ、汝の献身への我が惜しみ無き報いを見るがよい。」", "'Behold, mortal, how generously I reward thy loyalty.'"));
370370
371- acquirement(p_ptr->y, p_ptr->x, randint1(2) + 1, TRUE, FALSE, FALSE);
371+ acquirement(creature_ptr->y, creature_ptr->x, randint1(2) + 1, TRUE, FALSE, FALSE);
372372 reward = _("高級品のアイテムを手に入れた。", "excellent items");
373373 break;
374374
375375 case REW_TY_CURSE:
376- msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[p_ptr->chaos_patron]);
376+ msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[creature_ptr->chaos_patron]);
377377 msg_print(_("「下僕よ、汝傲慢なり。」", "'Thou art growing arrogant, mortal.'"));
378378
379379 (void)activate_ty_curse(FALSE, &count);
@@ -382,12 +382,12 @@ void gain_level_reward(int chosen_reward)
382382
383383 case REW_SUMMON_M:
384384
385- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
385+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
386386 msg_print(_("「我が下僕たちよ、かの傲慢なる者を倒すべし!」", "'My pets, destroy the arrogant mortal!'"));
387387
388388 for (dummy = 0; dummy < randint1(5) + 1; dummy++)
389389 {
390- (void)summon_specific(0, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
390+ (void)summon_specific(0, creature_ptr->y, creature_ptr->x, current_floor_ptr->dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
391391 }
392392 reward = _("モンスターを召喚された。", "summoning hostile monsters");
393393 break;
@@ -395,16 +395,16 @@ void gain_level_reward(int chosen_reward)
395395
396396 case REW_H_SUMMON:
397397
398- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
398+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
399399 msg_print(_("「汝、より強き敵を必要とせり!」", "'Thou needst worthier opponents!'"));
400400
401- activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
401+ activate_hi_summon(creature_ptr->y, creature_ptr->x, FALSE);
402402 reward = _("モンスターを召喚された。", "summoning many hostile monsters");
403403 break;
404404
405405
406406 case REW_DO_HAVOC:
407- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
407+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
408408 msg_print(_("「死と破壊こそ我が喜びなり!」", "'Death and destruction! This pleaseth me!'"));
409409
410410 call_chaos();
@@ -413,38 +413,38 @@ void gain_level_reward(int chosen_reward)
413413
414414
415415 case REW_GAIN_ABL:
416- msg_format(_("%sの声が鳴り響いた:", "The voice of %s rings out:"), chaos_patrons[p_ptr->chaos_patron]);
416+ msg_format(_("%sの声が鳴り響いた:", "The voice of %s rings out:"), chaos_patrons[creature_ptr->chaos_patron]);
417417 msg_print(_("「留まるのだ、下僕よ。余が汝の肉体を鍛えん。」", "'Stay, mortal, and let me mold thee.'"));
418418
419- if (one_in_(3) && !(chaos_stats[p_ptr->chaos_patron] < 0))
420- do_inc_stat(p_ptr, chaos_stats[p_ptr->chaos_patron]);
419+ if (one_in_(3) && !(chaos_stats[creature_ptr->chaos_patron] < 0))
420+ do_inc_stat(creature_ptr, chaos_stats[creature_ptr->chaos_patron]);
421421 else
422- do_inc_stat(p_ptr, randint0(6));
422+ do_inc_stat(creature_ptr, randint0(6));
423423 reward = _("能力値が上がった。", "increasing a stat");
424424 break;
425425
426426
427427 case REW_LOSE_ABL:
428- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
428+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
429429 msg_print(_("「下僕よ、余は汝に飽みたり。」", "'I grow tired of thee, mortal.'"));
430430
431- if (one_in_(3) && !(chaos_stats[p_ptr->chaos_patron] < 0))
432- do_dec_stat(p_ptr, chaos_stats[p_ptr->chaos_patron]);
431+ if (one_in_(3) && !(chaos_stats[creature_ptr->chaos_patron] < 0))
432+ do_dec_stat(creature_ptr, chaos_stats[creature_ptr->chaos_patron]);
433433 else
434- (void)do_dec_stat(p_ptr, randint0(6));
434+ (void)do_dec_stat(creature_ptr, randint0(6));
435435 reward = _("能力値が下がった。", "decreasing a stat");
436436 break;
437437
438438
439439 case REW_RUIN_ABL:
440440
441- msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[p_ptr->chaos_patron]);
441+ msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[creature_ptr->chaos_patron]);
442442 msg_print(_("「汝、謙虚たることを学ぶべし!」", "'Thou needst a lesson in humility, mortal!'"));
443443 msg_print(_("あなたは以前より弱くなった!", "You feel less powerful!"));
444444
445445 for (dummy = 0; dummy < A_MAX; dummy++)
446446 {
447- (void)dec_stat(p_ptr, dummy, 10 + randint1(15), TRUE);
447+ (void)dec_stat(creature_ptr, dummy, 10 + randint1(15), TRUE);
448448 }
449449 reward = _("全能力値が下がった。", "decreasing all stats");
450450 break;
@@ -452,38 +452,38 @@ void gain_level_reward(int chosen_reward)
452452 case REW_POLY_WND:
453453
454454 msg_format(_("%sの力が触れるのを感じた。", "You feel the power of %s touch you."),
455- chaos_patrons[p_ptr->chaos_patron]);
456- do_poly_wounds(p_ptr);
455+ chaos_patrons[creature_ptr->chaos_patron]);
456+ do_poly_wounds(creature_ptr);
457457 reward = _("傷が変化した。", "polymorphing wounds");
458458 break;
459459
460460 case REW_AUGM_ABL:
461461
462- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
462+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
463463
464464 msg_print(_("「我がささやかなる賜物を受けとるがよい!」", "'Receive this modest gift from me!'"));
465465
466466 for (dummy = 0; dummy < A_MAX; dummy++)
467467 {
468- (void)do_inc_stat(p_ptr, dummy);
468+ (void)do_inc_stat(creature_ptr, dummy);
469469 }
470470 reward = _("全能力値が上がった。", "increasing all stats");
471471 break;
472472
473473 case REW_HURT_LOT:
474474
475- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
475+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
476476 msg_print(_("「苦しむがよい、無能な愚か者よ!」", "'Suffer, pathetic fool!'"));
477477
478- fire_ball(GF_DISINTEGRATE, 0, p_ptr->lev * 4, 4);
479- take_hit(DAMAGE_NOESCAPE, p_ptr->lev * 4, wrath_reason, -1);
478+ fire_ball(GF_DISINTEGRATE, 0, creature_ptr->lev * 4, 4);
479+ take_hit(DAMAGE_NOESCAPE, creature_ptr->lev * 4, wrath_reason, -1);
480480 reward = _("分解の球が発生した。", "generating disintegration ball");
481481 break;
482482
483483 case REW_HEAL_FUL:
484484
485- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
486- (void)restore_level(p_ptr);
485+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
486+ (void)restore_level(creature_ptr);
487487 (void)restore_all_status();
488488 (void)true_healing(5000);
489489 reward = _("体力が回復した。", "healing");
@@ -492,7 +492,7 @@ void gain_level_reward(int chosen_reward)
492492 case REW_CURSE_WP:
493493
494494 if (!has_melee_weapon(INVEN_RARM) && !has_melee_weapon(INVEN_LARM)) break;
495- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
495+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
496496 msg_print(_("「汝、武器に頼ることなかれ。」", "'Thou reliest too much on thy weapon.'"));
497497
498498 dummy = INVEN_RARM;
@@ -501,25 +501,25 @@ void gain_level_reward(int chosen_reward)
501501 dummy = INVEN_LARM;
502502 if (has_melee_weapon(INVEN_RARM) && one_in_(2)) dummy = INVEN_RARM;
503503 }
504- object_desc(o_name, &p_ptr->inventory_list[dummy], OD_NAME_ONLY);
504+ object_desc(o_name, &creature_ptr->inventory_list[dummy], OD_NAME_ONLY);
505505 (void)curse_weapon(FALSE, dummy);
506506 reward = format(_("%sが破壊された。", "destroying %s"), o_name);
507507 break;
508508
509509 case REW_CURSE_AR:
510510
511- if (!p_ptr->inventory_list[INVEN_BODY].k_idx) break;
512- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
511+ if (!creature_ptr->inventory_list[INVEN_BODY].k_idx) break;
512+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
513513 msg_print(_("「汝、防具に頼ることなかれ。」", "'Thou reliest too much on thine equipment.'"));
514514
515- object_desc(o_name, &p_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);
515+ object_desc(o_name, &creature_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);
516516 (void)curse_armor();
517517 reward = format(_("%sが破壊された。", "destroying %s"), o_name);
518518 break;
519519
520520 case REW_PISS_OFF:
521521
522- msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), chaos_patrons[p_ptr->chaos_patron]);
522+ msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), chaos_patrons[creature_ptr->chaos_patron]);
523523 msg_print(_("「我を怒りしめた罪を償うべし。」", "'Now thou shalt pay for annoying me.'"));
524524
525525 switch (randint1(4))
@@ -529,7 +529,7 @@ void gain_level_reward(int chosen_reward)
529529 reward = _("禍々しい呪いをかけられた。", "cursing");
530530 break;
531531 case 2:
532- activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
532+ activate_hi_summon(creature_ptr->y, creature_ptr->x, FALSE);
533533 reward = _("モンスターを召喚された。", "summoning hostile monsters");
534534 break;
535535 case 3:
@@ -542,14 +542,14 @@ void gain_level_reward(int chosen_reward)
542542 dummy = INVEN_LARM;
543543 if (has_melee_weapon(INVEN_RARM) && one_in_(2)) dummy = INVEN_RARM;
544544 }
545- object_desc(o_name, &p_ptr->inventory_list[dummy], OD_NAME_ONLY);
545+ object_desc(o_name, &creature_ptr->inventory_list[dummy], OD_NAME_ONLY);
546546 (void)curse_weapon(FALSE, dummy);
547547 reward = format(_("%sが破壊された。", "destroying %s"), o_name);
548548 }
549549 else
550550 {
551- if (!p_ptr->inventory_list[INVEN_BODY].k_idx) break;
552- object_desc(o_name, &p_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);
551+ if (!creature_ptr->inventory_list[INVEN_BODY].k_idx) break;
552+ object_desc(o_name, &creature_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);
553553 (void)curse_armor();
554554 reward = format(_("%sが破壊された。", "destroying %s"), o_name);
555555 }
@@ -557,7 +557,7 @@ void gain_level_reward(int chosen_reward)
557557 default:
558558 for (dummy = 0; dummy < A_MAX; dummy++)
559559 {
560- (void)dec_stat(p_ptr, dummy, 10 + randint1(15), TRUE);
560+ (void)dec_stat(creature_ptr, dummy, 10 + randint1(15), TRUE);
561561 }
562562 reward = _("全能力値が下がった。", "decreasing all stats");
563563 break;
@@ -566,15 +566,15 @@ void gain_level_reward(int chosen_reward)
566566
567567 case REW_WRATH:
568568
569- msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[p_ptr->chaos_patron]);
569+ msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[creature_ptr->chaos_patron]);
570570 msg_print(_("「死ぬがよい、下僕よ!」", "'Die, mortal!'"));
571571
572- take_hit(DAMAGE_LOSELIFE, p_ptr->lev * 4, wrath_reason, -1);
572+ take_hit(DAMAGE_LOSELIFE, creature_ptr->lev * 4, wrath_reason, -1);
573573 for (dummy = 0; dummy < A_MAX; dummy++)
574574 {
575- (void)dec_stat(p_ptr, dummy, 10 + randint1(15), FALSE);
575+ (void)dec_stat(creature_ptr, dummy, 10 + randint1(15), FALSE);
576576 }
577- activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
577+ activate_hi_summon(creature_ptr->y, creature_ptr->x, FALSE);
578578 (void)activate_ty_curse(FALSE, &count);
579579 if (one_in_(2))
580580 {
@@ -594,16 +594,16 @@ void gain_level_reward(int chosen_reward)
594594
595595 case REW_DESTRUCT:
596596
597- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
597+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
598598 msg_print(_("「死と破壊こそ我が喜びなり!」", "'Death and destruction! This pleaseth me!'"));
599599
600- (void)destroy_area(p_ptr->y, p_ptr->x, 25, FALSE);
600+ (void)destroy_area(creature_ptr->y, creature_ptr->x, 25, FALSE);
601601 reward = _("ダンジョンが*破壊*された。", "*destruct*ing dungeon");
602602 break;
603603
604604 case REW_GENOCIDE:
605605
606- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
606+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
607607 msg_print(_("「我、汝の敵を抹殺せん!」", "'Let me relieve thee of thine oppressors!'"));
608608 (void)symbol_genocide(0, FALSE);
609609 reward = _("モンスターが抹殺された。", "genociding monsters");
@@ -611,7 +611,7 @@ void gain_level_reward(int chosen_reward)
611611
612612 case REW_MASS_GEN:
613613
614- msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
614+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
615615 msg_print(_("「我、汝の敵を抹殺せん!」", "'Let me relieve thee of thine oppressors!'"));
616616
617617 (void)mass_genocide(0, FALSE);
@@ -620,20 +620,20 @@ void gain_level_reward(int chosen_reward)
620620
621621 case REW_DISPEL_C:
622622
623- msg_format(_("%sの力が敵を攻撃するのを感じた!", "You can feel the power of %s assault your enemies!"), chaos_patrons[p_ptr->chaos_patron]);
624- (void)dispel_monsters(p_ptr->lev * 4);
623+ msg_format(_("%sの力が敵を攻撃するのを感じた!", "You can feel the power of %s assault your enemies!"), chaos_patrons[creature_ptr->chaos_patron]);
624+ (void)dispel_monsters(creature_ptr->lev * 4);
625625 break;
626626
627627 case REW_IGNORE:
628628
629- msg_format(_("%sはあなたを無視した。", "%s ignores you."), chaos_patrons[p_ptr->chaos_patron]);
629+ msg_format(_("%sはあなたを無視した。", "%s ignores you."), chaos_patrons[creature_ptr->chaos_patron]);
630630 break;
631631
632632 case REW_SER_DEMO:
633633
634- msg_format(_("%sは褒美として悪魔の使いをよこした!", "%s rewards you with a demonic servant!"), chaos_patrons[p_ptr->chaos_patron]);
634+ msg_format(_("%sは褒美として悪魔の使いをよこした!", "%s rewards you with a demonic servant!"), chaos_patrons[creature_ptr->chaos_patron]);
635635
636- if (!summon_specific(-1, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, SUMMON_DEMON, PM_FORCE_PET))
636+ if (!summon_specific(-1, creature_ptr->y, creature_ptr->x, current_floor_ptr->dun_level, SUMMON_DEMON, PM_FORCE_PET))
637637 msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
638638 else
639639 reward = _("悪魔がペットになった。", "a demonic servant");
@@ -641,9 +641,9 @@ void gain_level_reward(int chosen_reward)
641641 break;
642642
643643 case REW_SER_MONS:
644- msg_format(_("%sは褒美として使いをよこした!", "%s rewards you with a servant!"), chaos_patrons[p_ptr->chaos_patron]);
644+ msg_format(_("%sは褒美として使いをよこした!", "%s rewards you with a servant!"), chaos_patrons[creature_ptr->chaos_patron]);
645645
646- if (!summon_specific(-1, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, 0, PM_FORCE_PET))
646+ if (!summon_specific(-1, creature_ptr->y, creature_ptr->x, current_floor_ptr->dun_level, 0, PM_FORCE_PET))
647647 msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
648648 else
649649 reward = _("モンスターがペットになった。", "a servant");
@@ -651,9 +651,9 @@ void gain_level_reward(int chosen_reward)
651651 break;
652652
653653 case REW_SER_UNDE:
654- msg_format(_("%sは褒美としてアンデッドの使いをよこした。", "%s rewards you with an undead servant!"), chaos_patrons[p_ptr->chaos_patron]);
654+ msg_format(_("%sは褒美としてアンデッドの使いをよこした。", "%s rewards you with an undead servant!"), chaos_patrons[creature_ptr->chaos_patron]);
655655
656- if (!summon_specific(-1, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, SUMMON_UNDEAD, PM_FORCE_PET))
656+ if (!summon_specific(-1, creature_ptr->y, creature_ptr->x, current_floor_ptr->dun_level, SUMMON_UNDEAD, PM_FORCE_PET))
657657 msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
658658 else
659659 reward = _("アンデッドがペットになった。", "an undead servant");
@@ -661,7 +661,7 @@ void gain_level_reward(int chosen_reward)
661661 break;
662662
663663 default:
664- msg_format(_("%sの声がどもった:", "The voice of %s stammers:"), chaos_patrons[p_ptr->chaos_patron]);
664+ msg_format(_("%sの声がどもった:", "The voice of %s stammers:"), chaos_patrons[creature_ptr->chaos_patron]);
665665 msg_format(_("「あー、あー、答えは %d/%d。質問は何?」", "'Uh... uh... the answer's %d/%d, what's the question?'"), type, effect);
666666
667667 }
--- a/src/patron.h
+++ b/src/patron.h
@@ -39,7 +39,7 @@
3939 #define REW_SER_DEMO 35 /*!< カオスパトロンからの報酬: 悪魔の下僕下賜 */
4040 #define REW_SER_MONS 36 /*!< カオスパトロンからの報酬: モンスターの下僕下賜 */
4141
42-extern void gain_level_reward(int chosen_reward);
42+extern void gain_level_reward(player_type *creature_ptr, int chosen_reward);
4343 extern void admire_from_patron(player_type *creature_ptr);
4444 extern const concptr chaos_patrons[MAX_PATRON];
4545
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5618,7 +5618,7 @@ void check_experience(void)
56185618 */
56195619 if (level_reward)
56205620 {
5621- gain_level_reward(0);
5621+ gain_level_reward(p_ptr, 0);
56225622 level_reward = FALSE;
56235623 }
56245624
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1807,7 +1807,7 @@ void do_cmd_debug(void)
18071807
18081808 /* Specific reward */
18091809 case 'r':
1810- (void)gain_level_reward(command_arg);
1810+ (void)gain_level_reward(p_ptr, command_arg);
18111811 break;
18121812
18131813 /* Summon _friendly_ named monster */
Show on old repository browser