OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

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


Commit MetaInfo

Revision1dc5552de03bf8c1aea9f8be70551284b2bb43a0 (tree)
Time2019-07-01 00:05:56
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #38997 lose_mutation() に player_type * 引数を追加．

Change Summary

Incremental Difference

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3996,7 +3996,7 @@ static void bldg_process_command(building_type *bldg, int i)
39963996 if (p_ptr->muta1 || p_ptr->muta2 || (p_ptr->muta3 & ~MUT3_GOOD_LUCK) ||
39973997 (p_ptr->pseikaku != SEIKAKU_LUCKY && (p_ptr->muta3 & MUT3_GOOD_LUCK)))
39983998 {
3999- while(!lose_mutation(0));
3999+ while(!lose_mutation(p_ptr, 0));
40004000 paid = TRUE;
40014001 }
40024002 else
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -505,7 +505,7 @@ void exe_quaff_potion(INVENTORY_IDX item)
505505 {
506506 if(gain_mutation(p_ptr, 0)) ident = TRUE;
507507 }
508- else if (lose_mutation(0)) ident = TRUE;
508+ else if (lose_mutation(p_ptr, 0)) ident = TRUE;
509509 } while(!ident || one_in_(2));
510510 }
511511 break;
--- a/src/core.c
+++ b/src/core.c
@@ -2388,7 +2388,7 @@ static void process_world_aux_mutation(void)
23882388 }
23892389 if ((p_ptr->muta2 & MUT2_NORMALITY) && one_in_(5000))
23902390 {
2391- if (!lose_mutation(0))
2391+ if (!lose_mutation(p_ptr, 0))
23922392 msg_print(_("奇妙なくらい普通になった気がする。", "You feel oddly normal."));
23932393 }
23942394 if ((p_ptr->muta2 & MUT2_WRAITH) && !p_ptr->anti_magic && one_in_(3000))
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -879,7 +879,7 @@ bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut)
879879 * @param choose_mut 取り除きたい突然変異のID、0ならばランダムに消去
880880 * @return なし
881881 */
882-bool lose_mutation(MUTATION_IDX choose_mut)
882+bool lose_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut)
883883 {
884884 int attempts_left = 20;
885885 concptr muta_desc = "";
@@ -894,578 +894,578 @@ bool lose_mutation(MUTATION_IDX choose_mut)
894894 switch (choose_mut ? choose_mut : randint1(193))
895895 {
896896 case 1: case 2: case 3: case 4:
897- muta_class = &(p_ptr->muta1);
897+ muta_class = &(creature_ptr->muta1);
898898 muta_which = MUT1_SPIT_ACID;
899899 muta_desc = _( "酸を吹きかける能力を失った。", "You lose the ability to spit acid.");
900900
901901 break;
902902 case 5: case 6: case 7:
903- muta_class = &(p_ptr->muta1);
903+ muta_class = &(creature_ptr->muta1);
904904 muta_which = MUT1_BR_FIRE;
905905 muta_desc = _( "炎のブレスを吐く能力を失った。", "You lose the ability to breathe fire.");
906906
907907 break;
908908 case 8: case 9:
909- muta_class = &(p_ptr->muta1);
909+ muta_class = &(creature_ptr->muta1);
910910 muta_which = MUT1_HYPN_GAZE;
911911 muta_desc = _( "あなたの目はつまらない目になった。", "Your eyes look uninteresting.");
912912
913913 break;
914914 case 10: case 11:
915- muta_class = &(p_ptr->muta1);
915+ muta_class = &(creature_ptr->muta1);
916916 muta_which = MUT1_TELEKINES;
917917 muta_desc = _( "念動力で物を動かす能力を失った。", "You lose the ability to move objects telekinetically.");
918918
919919 break;
920920 case 12: case 13: case 14:
921- muta_class = &(p_ptr->muta1);
921+ muta_class = &(creature_ptr->muta1);
922922 muta_which = MUT1_VTELEPORT;
923923 muta_desc = _( "自分の意思でテレポートする能力を失った。", "You lose the power of teleportation at will.");
924924
925925 break;
926926 case 15: case 16:
927- muta_class = &(p_ptr->muta1);
927+ muta_class = &(creature_ptr->muta1);
928928 muta_which = MUT1_MIND_BLST;
929929 muta_desc = _( "精神攻撃の能力を失った。", "You lose the power of Mind Blast.");
930930
931931 break;
932932 case 17: case 18:
933- muta_class = &(p_ptr->muta1);
933+ muta_class = &(creature_ptr->muta1);
934934 muta_which = MUT1_RADIATION;
935935 muta_desc = _( "あなたは放射能を発生しなくなった。", "You stop emitting hard radiation.");
936936
937937 break;
938938 case 19: case 20:
939- muta_class = &(p_ptr->muta1);
939+ muta_class = &(creature_ptr->muta1);
940940 muta_which = MUT1_VAMPIRISM;
941941 muta_desc = _( "吸血の能力を失った。", "You are no longer vampiric.");
942942
943943 break;
944944 case 21: case 22: case 23:
945- muta_class = &(p_ptr->muta1);
945+ muta_class = &(creature_ptr->muta1);
946946 muta_which = MUT1_SMELL_MET;
947947 muta_desc = _( "金属の臭いを嗅げなくなった。", "You no longer smell a metallic odor.");
948948
949949 break;
950950 case 24: case 25: case 26: case 27:
951- muta_class = &(p_ptr->muta1);
951+ muta_class = &(creature_ptr->muta1);
952952 muta_which = MUT1_SMELL_MON;
953953 muta_desc = _( "不潔なモンスターの臭いを嗅げなくなった。", "You no longer smell filthy monsters.");
954954
955955 break;
956956 case 28: case 29: case 30:
957- muta_class = &(p_ptr->muta1);
957+ muta_class = &(creature_ptr->muta1);
958958 muta_which = MUT1_BLINK;
959959 muta_desc = _( "近距離テレポートの能力を失った。", "You lose the power of minor teleportation.");
960960
961961 break;
962962 case 31: case 32:
963- muta_class = &(p_ptr->muta1);
963+ muta_class = &(creature_ptr->muta1);
964964 muta_which = MUT1_EAT_ROCK;
965965 muta_desc = _( "壁は美味しそうに見えなくなった。", "The walls look unappetizing.");
966966
967967 break;
968968 case 33: case 34:
969- muta_class = &(p_ptr->muta1);
969+ muta_class = &(creature_ptr->muta1);
970970 muta_which = MUT1_SWAP_POS;
971971 muta_desc = _( "あなたは自分の靴に留まる感じがする。", "You feel like staying in your own shoes.");
972972
973973 break;
974974 case 35: case 36: case 37:
975- muta_class = &(p_ptr->muta1);
975+ muta_class = &(creature_ptr->muta1);
976976 muta_which = MUT1_SHRIEK;
977977 muta_desc = _( "あなたの声質は弱くなった。", "Your vocal cords get much weaker.");
978978
979979 break;
980980 case 38: case 39: case 40:
981- muta_class = &(p_ptr->muta1);
981+ muta_class = &(creature_ptr->muta1);
982982 muta_which = MUT1_ILLUMINE;
983983 muta_desc = _( "部屋を明るく照らすことが出来なくなった。", "You can no longer light up rooms with your presence.");
984984
985985 break;
986986 case 41: case 42:
987- muta_class = &(p_ptr->muta1);
987+ muta_class = &(creature_ptr->muta1);
988988 muta_which = MUT1_DET_CURSE;
989989 muta_desc = _( "邪悪な魔法を感じられなくなった。", "You can no longer feel evil magics.");
990990
991991 break;
992992 case 43: case 44: case 45:
993- muta_class = &(p_ptr->muta1);
993+ muta_class = &(creature_ptr->muta1);
994994 muta_which = MUT1_BERSERK;
995995 muta_desc = _( "制御できる激情を感じなくなった。", "You no longer feel a controlled rage.");
996996
997997 break;
998998 case 46:
999- muta_class = &(p_ptr->muta1);
999+ muta_class = &(creature_ptr->muta1);
10001000 muta_which = MUT1_POLYMORPH;
10011001 muta_desc = _( "あなたの体は安定したように見える。", "Your body seems stable.");
10021002
10031003 break;
10041004 case 47: case 48:
1005- muta_class = &(p_ptr->muta1);
1005+ muta_class = &(creature_ptr->muta1);
10061006 muta_which = MUT1_MIDAS_TCH;
10071007 muta_desc = _( "ミダスの手の能力を失った。", "You lose the Midas touch.");
10081008
10091009 break;
10101010 case 49:
1011- muta_class = &(p_ptr->muta1);
1011+ muta_class = &(creature_ptr->muta1);
10121012 muta_which = MUT1_GROW_MOLD;
10131013 muta_desc = _( "突然カビが嫌いになった。", "You feel a sudden dislike for mold.");
10141014
10151015 break;
10161016 case 50: case 51: case 52:
1017- muta_class = &(p_ptr->muta1);
1017+ muta_class = &(creature_ptr->muta1);
10181018 muta_which = MUT1_RESIST;
10191019 muta_desc = _( "傷つき易くなった気がする。", "You feel like you might be vulnerable.");
10201020
10211021 break;
10221022 case 53: case 54: case 55:
1023- muta_class = &(p_ptr->muta1);
1023+ muta_class = &(creature_ptr->muta1);
10241024 muta_which = MUT1_EARTHQUAKE;
10251025 muta_desc = _( "ダンジョンを壊す能力を失った。", "You lose the ability to wreck the dungeon.");
10261026
10271027 break;
10281028 case 56:
1029- muta_class = &(p_ptr->muta1);
1029+ muta_class = &(creature_ptr->muta1);
10301030 muta_which = MUT1_EAT_MAGIC;
10311031 muta_desc = _( "魔法のアイテムはもう美味しそうに見えなくなった。", "Your magic items no longer look delicious.");
10321032
10331033 break;
10341034 case 57: case 58:
1035- muta_class = &(p_ptr->muta1);
1035+ muta_class = &(creature_ptr->muta1);
10361036 muta_which = MUT1_WEIGH_MAG;
10371037 muta_desc = _( "魔力を感じられなくなった。", "You no longer sense magic.");
10381038
10391039 break;
10401040 case 59:
1041- muta_class = &(p_ptr->muta1);
1041+ muta_class = &(creature_ptr->muta1);
10421042 muta_which = MUT1_STERILITY;
10431043 muta_desc = _( "たくさんの安堵の吐息が聞こえた。", "You hear a massed sigh of relief.");
10441044
10451045 break;
10461046 case 60: case 61:
1047- muta_class = &(p_ptr->muta1);
1047+ muta_class = &(creature_ptr->muta1);
10481048 muta_which = MUT1_PANIC_HIT;
10491049 muta_desc = _( "あちこちへ跳べる気分がなくなった。", "You no longer feel jumpy.");
10501050
10511051 break;
10521052 case 62: case 63: case 64:
1053- muta_class = &(p_ptr->muta1);
1053+ muta_class = &(creature_ptr->muta1);
10541054 muta_which = MUT1_DAZZLE;
10551055 muta_desc = _( "まばゆい閃光を発する能力を失った。", "You lose the ability to emit dazzling lights.");
10561056
10571057 break;
10581058 case 65: case 66: case 67:
1059- muta_class = &(p_ptr->muta1);
1059+ muta_class = &(creature_ptr->muta1);
10601060 muta_which = MUT1_LASER_EYE;
10611061 muta_desc = _( "眼が少しの間焼き付いて、痛みが和らいだ。", "Your eyes burn for a moment, then feel soothed.");
10621062
10631063 break;
10641064 case 68: case 69:
1065- muta_class = &(p_ptr->muta1);
1065+ muta_class = &(creature_ptr->muta1);
10661066 muta_which = MUT1_RECALL;
10671067 muta_desc = _( "少しの間ホームシックになった。", "You feel briefly homesick.");
10681068
10691069 break;
10701070 case 70:
1071- muta_class = &(p_ptr->muta1);
1071+ muta_class = &(creature_ptr->muta1);
10721072 muta_which = MUT1_BANISH;
10731073 muta_desc = _( "神聖な怒りの力を感じなくなった。", "You no longer feel a holy wrath.");
10741074
10751075 break;
10761076 case 71: case 72:
1077- muta_class = &(p_ptr->muta1);
1077+ muta_class = &(creature_ptr->muta1);
10781078 muta_which = MUT1_COLD_TOUCH;
10791079 muta_desc = _( "手が暖かくなった。", "Your hands warm up.");
10801080
10811081 break;
10821082 case 73: case 74:
1083- muta_class = &(p_ptr->muta1);
1083+ muta_class = &(creature_ptr->muta1);
10841084 muta_which = MUT1_LAUNCHER;
10851085 muta_desc = _( "物を投げる手が弱くなった気がする。", "Your throwing arm feels much weaker.");
10861086
10871087 break;
10881088 case 75:
1089- muta_class = &(p_ptr->muta2);
1089+ muta_class = &(creature_ptr->muta2);
10901090 muta_which = MUT2_BERS_RAGE;
10911091 muta_desc = _( "凶暴化の発作にさらされなくなった！", "You are no longer subject to fits of berserk rage!");
10921092
10931093 break;
10941094 case 76:
1095- muta_class = &(p_ptr->muta2);
1095+ muta_class = &(creature_ptr->muta2);
10961096 muta_which = MUT2_COWARDICE;
10971097 muta_desc = _( "もう信じがたいほど臆病ではなくなった！", "You are no longer an incredible coward!");
10981098
10991099 break;
11001100 case 77:
1101- muta_class = &(p_ptr->muta2);
1101+ muta_class = &(creature_ptr->muta2);
11021102 muta_which = MUT2_RTELEPORT;
11031103 muta_desc = _( "あなたの位置はより確定的になった。", "Your position seems more certain.");
11041104
11051105 break;
11061106 case 78:
1107- muta_class = &(p_ptr->muta2);
1107+ muta_class = &(creature_ptr->muta2);
11081108 muta_which = MUT2_ALCOHOL;
11091109 muta_desc = _( "あなたはアルコールを分泌しなくなった！", "Your body stops producing alcohol!");
11101110
11111111 break;
11121112 case 79:
1113- muta_class = &(p_ptr->muta2);
1113+ muta_class = &(creature_ptr->muta2);
11141114 muta_which = MUT2_HALLU;
11151115 muta_desc = _( "幻覚をひき起こす精神障害を起こさなくなった！", "You are no longer afflicted by a hallucinatory insanity!");
11161116
11171117 break;
11181118 case 80:
1119- muta_class = &(p_ptr->muta2);
1119+ muta_class = &(creature_ptr->muta2);
11201120 muta_which = MUT2_FLATULENT;
11211121 muta_desc = _( "もう強烈な屁はこかなくなった。", "You are no longer subject to uncontrollable flatulence.");
11221122
11231123 break;
11241124 case 81: case 82:
1125- muta_class = &(p_ptr->muta2);
1125+ muta_class = &(creature_ptr->muta2);
11261126 muta_which = MUT2_SCOR_TAIL;
11271127 muta_desc = _( "サソリの尻尾がなくなった！", "You lose your scorpion tail!");
11281128
11291129 break;
11301130 case 83: case 84:
1131- muta_class = &(p_ptr->muta2);
1131+ muta_class = &(creature_ptr->muta2);
11321132 muta_which = MUT2_HORNS;
11331133 muta_desc = _( "額から角が消えた！", "Your horns vanish from your forehead!");
11341134
11351135 break;
11361136 case 85: case 86:
1137- muta_class = &(p_ptr->muta2);
1137+ muta_class = &(creature_ptr->muta2);
11381138 muta_which = MUT2_BEAK;
11391139 muta_desc = _( "口が普通に戻った！", "Your mouth reverts to normal!");
11401140
11411141 break;
11421142 case 87: case 88:
1143- muta_class = &(p_ptr->muta2);
1143+ muta_class = &(creature_ptr->muta2);
11441144 muta_which = MUT2_ATT_DEMON;
11451145 muta_desc = _( "デーモンを引き寄せなくなった。", "You stop attracting demons.");
11461146
11471147 break;
11481148 case 89:
1149- muta_class = &(p_ptr->muta2);
1149+ muta_class = &(creature_ptr->muta2);
11501150 muta_which = MUT2_PROD_MANA;
11511151 muta_desc = _( "制御不能な魔法のエネルギーを発生しなくなった。", "You stop producing magical energy uncontrollably.");
11521152
11531153 break;
11541154 case 90: case 91:
1155- muta_class = &(p_ptr->muta2);
1155+ muta_class = &(creature_ptr->muta2);
11561156 muta_which = MUT2_SPEED_FLUX;
11571157 muta_desc = _( "躁鬱質でなくなった。", "You are no longer manic-depressive.");
11581158
11591159 break;
11601160 case 92: case 93:
1161- muta_class = &(p_ptr->muta2);
1161+ muta_class = &(creature_ptr->muta2);
11621162 muta_which = MUT2_BANISH_ALL;
11631163 muta_desc = _( "背後に恐ろしい力を感じなくなった。", "You no longer feel a terrifying power lurking behind you.");
11641164
11651165 break;
11661166 case 94:
1167- muta_class = &(p_ptr->muta2);
1167+ muta_class = &(creature_ptr->muta2);
11681168 muta_which = MUT2_EAT_LIGHT;
11691169 muta_desc = _( "世界が明るいと感じる。", "You feel the world's a brighter place.");
11701170
11711171 break;
11721172 case 95: case 96:
1173- muta_class = &(p_ptr->muta2);
1173+ muta_class = &(creature_ptr->muta2);
11741174 muta_which = MUT2_TRUNK;
11751175 muta_desc = _( "鼻が普通の長さに戻った。", "Your nose returns to a normal length.");
11761176
11771177 break;
11781178 case 97:
1179- muta_class = &(p_ptr->muta2);
1179+ muta_class = &(creature_ptr->muta2);
11801180 muta_which = MUT2_ATT_ANIMAL;
11811181 muta_desc = _( "動物を引き寄せなくなった。", "You stop attracting animals.");
11821182
11831183 break;
11841184 case 98:
1185- muta_class = &(p_ptr->muta2);
1185+ muta_class = &(creature_ptr->muta2);
11861186 muta_which = MUT2_TENTACLES;
11871187 muta_desc = _( "触手が消えた。", "Your tentacles vanish from your sides.");
11881188
11891189 break;
11901190 case 99:
1191- muta_class = &(p_ptr->muta2);
1191+ muta_class = &(creature_ptr->muta2);
11921192 muta_which = MUT2_RAW_CHAOS;
11931193 muta_desc = _( "周囲の空間が安定した気がする。", "You feel the universe is more stable around you.");
11941194
11951195 break;
11961196 case 100: case 101: case 102:
1197- muta_class = &(p_ptr->muta2);
1197+ muta_class = &(creature_ptr->muta2);
11981198 muta_which = MUT2_NORMALITY;
11991199 muta_desc = _( "普通に奇妙な感じがする。", "You feel normally strange.");
12001200
12011201 break;
12021202 case 103:
1203- muta_class = &(p_ptr->muta2);
1203+ muta_class = &(creature_ptr->muta2);
12041204 muta_which = MUT2_WRAITH;
12051205 muta_desc = _( "あなたは物質世界にしっかり存在している。", "You are firmly in the physical world.");
12061206
12071207 break;
12081208 case 104:
1209- muta_class = &(p_ptr->muta2);
1209+ muta_class = &(creature_ptr->muta2);
12101210 muta_which = MUT2_POLY_WOUND;
12111211 muta_desc = _( "古い傷からカオスの力が去っていった。", "You feel forces of chaos departing your old scars.");
12121212
12131213 break;
12141214 case 105:
1215- muta_class = &(p_ptr->muta2);
1215+ muta_class = &(creature_ptr->muta2);
12161216 muta_which = MUT2_WASTING;
12171217 muta_desc = _( "おぞましい衰弱病が治った！", "You are cured of the horrible wasting disease!");
12181218
12191219 break;
12201220 case 106:
1221- muta_class = &(p_ptr->muta2);
1221+ muta_class = &(creature_ptr->muta2);
12221222 muta_which = MUT2_ATT_DRAGON;
12231223 muta_desc = _( "ドラゴンを引き寄せなくなった。", "You stop attracting dragons.");
12241224
12251225 break;
12261226 case 107: case 108:
1227- muta_class = &(p_ptr->muta2);
1227+ muta_class = &(creature_ptr->muta2);
12281228 muta_which = MUT2_WEIRD_MIND;
12291229 muta_desc = _( "思考が退屈な方向に戻った。", "Your thoughts return to boring paths.");
12301230
12311231 break;
12321232 case 109:
1233- muta_class = &(p_ptr->muta2);
1233+ muta_class = &(creature_ptr->muta2);
12341234 muta_which = MUT2_NAUSEA;
12351235 muta_desc = _( "胃が痙攣しなくなった。", "Your stomach stops roiling.");
12361236
12371237 break;
12381238 case 110: case 111:
1239- muta_class = &(p_ptr->muta2);
1239+ muta_class = &(creature_ptr->muta2);
12401240 muta_which = MUT2_CHAOS_GIFT;
12411241 muta_desc = _( "混沌の神々の興味を惹かなくなった。", "You lose the attention of the chaos deities.");
12421242
12431243 break;
12441244 case 112:
1245- muta_class = &(p_ptr->muta2);
1245+ muta_class = &(creature_ptr->muta2);
12461246 muta_which = MUT2_WALK_SHAD;
12471247 muta_desc = _( "物質世界に捕らわれている気がする。", "You feel like you're trapped in reality.");
12481248
12491249 break;
12501250 case 113: case 114:
1251- muta_class = &(p_ptr->muta2);
1251+ muta_class = &(creature_ptr->muta2);
12521252 muta_which = MUT2_WARNING;
12531253 muta_desc = _( "パラノイアでなくなった。", "You no longer feel paranoid.");
12541254
12551255 break;
12561256 case 115:
1257- muta_class = &(p_ptr->muta2);
1257+ muta_class = &(creature_ptr->muta2);
12581258 muta_which = MUT2_INVULN;
12591259 muta_desc = _( "無敵状態の発作を起こさなくなった。", "You are no longer blessed with fits of invulnerability.");
12601260
12611261 break;
12621262 case 116: case 117:
1263- muta_class = &(p_ptr->muta2);
1263+ muta_class = &(creature_ptr->muta2);
12641264 muta_which = MUT2_SP_TO_HP;
12651265 muta_desc = _( "魔法の治癒の発作に襲われなくなった。", "You are no longer subject to fits of magical healing.");
12661266
12671267 break;
12681268 case 118:
1269- muta_class = &(p_ptr->muta2);
1269+ muta_class = &(creature_ptr->muta2);
12701270 muta_which = MUT2_HP_TO_SP;
12711271 muta_desc = _( "痛みを伴う精神明瞭化の発作に襲われなくなった。", "You are no longer subject to fits of painful clarity.");
12721272
12731273 break;
12741274 case 119:
1275- muta_class = &(p_ptr->muta2);
1275+ muta_class = &(creature_ptr->muta2);
12761276 muta_which = MUT2_DISARM;
12771277 muta_desc = _( "脚が元の大きさに戻った。", "Your feet shrink to their former size.");
12781278
12791279 break;
12801280 case 120: case 121: case 122:
1281- muta_class = &(p_ptr->muta3);
1281+ muta_class = &(creature_ptr->muta3);
12821282 muta_which = MUT3_HYPER_STR;
12831283 muta_desc = _( "筋肉が普通に戻った。", "Your muscles revert to normal.");
12841284
12851285 break;
12861286 case 123: case 124: case 125:
1287- muta_class = &(p_ptr->muta3);
1287+ muta_class = &(creature_ptr->muta3);
12881288 muta_which = MUT3_PUNY;
12891289 muta_desc = _( "筋肉が普通に戻った。", "Your muscles revert to normal.");
12901290
12911291 break;
12921292 case 126: case 127: case 128:
1293- muta_class = &(p_ptr->muta3);
1293+ muta_class = &(creature_ptr->muta3);
12941294 muta_which = MUT3_HYPER_INT;
12951295 muta_desc = _( "脳が普通に戻った。", "Your brain reverts to normal.");
12961296
12971297 break;
12981298 case 129: case 130: case 131:
1299- muta_class = &(p_ptr->muta3);
1299+ muta_class = &(creature_ptr->muta3);
13001300 muta_which = MUT3_MORONIC;
13011301 muta_desc = _( "脳が普通に戻った。", "Your brain reverts to normal.");
13021302
13031303 break;
13041304 case 132: case 133:
1305- muta_class = &(p_ptr->muta3);
1305+ muta_class = &(creature_ptr->muta3);
13061306 muta_which = MUT3_RESILIENT;
13071307 muta_desc = _( "普通の丈夫さに戻った。", "You become ordinarily resilient again.");
13081308
13091309 break;
13101310 case 134: case 135:
1311- muta_class = &(p_ptr->muta3);
1311+ muta_class = &(creature_ptr->muta3);
13121312 muta_which = MUT3_XTRA_FAT;
13131313 muta_desc = _( "奇跡的なダイエットに成功した！", "You benefit from a miracle diet!");
13141314
13151315 break;
13161316 case 136: case 137:
1317- muta_class = &(p_ptr->muta3);
1317+ muta_class = &(creature_ptr->muta3);
13181318 muta_which = MUT3_ALBINO;
13191319 muta_desc = _( "アルビノでなくなった！", "You are no longer an albino!");
13201320
13211321 break;
13221322 case 138: case 139: case 140:
1323- muta_class = &(p_ptr->muta3);
1323+ muta_class = &(creature_ptr->muta3);
13241324 muta_which = MUT3_FLESH_ROT;
13251325 muta_desc = _( "肉体を腐敗させる病気が治った！", "Your flesh is no longer afflicted by a rotting disease!");
13261326
13271327 break;
13281328 case 141: case 142:
1329- muta_class = &(p_ptr->muta3);
1329+ muta_class = &(creature_ptr->muta3);
13301330 muta_which = MUT3_SILLY_VOI;
13311331 muta_desc = _( "声質が普通に戻った。", "Your voice returns to normal.");
13321332
13331333 break;
13341334 case 143: case 144:
1335- muta_class = &(p_ptr->muta3);
1335+ muta_class = &(creature_ptr->muta3);
13361336 muta_which = MUT3_BLANK_FAC;
13371337 muta_desc = _( "顔に目鼻が戻った。", "Your facial features return.");
13381338
13391339 break;
13401340 case 145:
1341- muta_class = &(p_ptr->muta3);
1341+ muta_class = &(creature_ptr->muta3);
13421342 muta_which = MUT3_ILL_NORM;
13431343 muta_desc = _( "心が安らぐ幻影を映し出さなくなった。", "You stop projecting a reassuring image.");
13441344
13451345 break;
13461346 case 146: case 147: case 148:
1347- muta_class = &(p_ptr->muta3);
1347+ muta_class = &(creature_ptr->muta3);
13481348 muta_which = MUT3_XTRA_EYES;
13491349 muta_desc = _( "余分な目が消えてしまった！", "Your extra eyes vanish!");
13501350
13511351 break;
13521352 case 149: case 150:
1353- muta_class = &(p_ptr->muta3);
1353+ muta_class = &(creature_ptr->muta3);
13541354 muta_which = MUT3_MAGIC_RES;
13551355 muta_desc = _( "魔法に弱くなった。", "You become susceptible to magic again.");
13561356
13571357 break;
13581358 case 151: case 152: case 153:
1359- muta_class = &(p_ptr->muta3);
1359+ muta_class = &(creature_ptr->muta3);
13601360 muta_which = MUT3_XTRA_NOIS;
13611361 muta_desc = _( "奇妙な音を立てなくなった！", "You stop making strange noise!");
13621362
13631363 break;
13641364 case 154: case 155: case 156:
1365- muta_class = &(p_ptr->muta3);
1365+ muta_class = &(creature_ptr->muta3);
13661366 muta_which = MUT3_INFRAVIS;
13671367 muta_desc = _( "赤外線視力が落ちた。", "Your infravision is degraded.");
13681368
13691369 break;
13701370 case 157: case 158:
1371- muta_class = &(p_ptr->muta3);
1371+ muta_class = &(creature_ptr->muta3);
13721372 muta_which = MUT3_XTRA_LEGS;
13731373 muta_desc = _( "余分な脚が消えてしまった！", "Your extra legs disappear!");
13741374
13751375 break;
13761376 case 159: case 160:
1377- muta_class = &(p_ptr->muta3);
1377+ muta_class = &(creature_ptr->muta3);
13781378 muta_which = MUT3_SHORT_LEG;
13791379 muta_desc = _( "脚の長さが普通に戻った。", "Your legs lengthen to normal.");
13801380
13811381 break;
13821382 case 161: case 162:
1383- muta_class = &(p_ptr->muta3);
1383+ muta_class = &(creature_ptr->muta3);
13841384 muta_which = MUT3_ELEC_TOUC;
13851385 muta_desc = _( "体を電流が流れなくなった。", "Electricity stops running through you.");
13861386
13871387 break;
13881388 case 163: case 164:
1389- muta_class = &(p_ptr->muta3);
1389+ muta_class = &(creature_ptr->muta3);
13901390 muta_which = MUT3_FIRE_BODY;
13911391 muta_desc = _( "体が炎に包まれなくなった。", "Your body is no longer enveloped in flames.");
13921392
13931393 break;
13941394 case 165: case 166: case 167:
1395- muta_class = &(p_ptr->muta3);
1395+ muta_class = &(creature_ptr->muta3);
13961396 muta_which = MUT3_WART_SKIN;
13971397 muta_desc = _( "イボイボが消えた！", "Your warts disappear!");
13981398
13991399 break;
14001400 case 168: case 169: case 170:
1401- muta_class = &(p_ptr->muta3);
1401+ muta_class = &(creature_ptr->muta3);
14021402 muta_which = MUT3_SCALES;
14031403 muta_desc = _( "鱗が消えた！", "Your scales vanish!");
14041404
14051405 break;
14061406 case 171: case 172:
1407- muta_class = &(p_ptr->muta3);
1407+ muta_class = &(creature_ptr->muta3);
14081408 muta_which = MUT3_IRON_SKIN;
14091409 muta_desc = _( "肌が肉にもどった！", "Your skin reverts to flesh!");
14101410
14111411 break;
14121412 case 173: case 174:
1413- muta_class = &(p_ptr->muta3);
1413+ muta_class = &(creature_ptr->muta3);
14141414 muta_which = MUT3_WINGS;
14151415 muta_desc = _( "背中の羽根が取れ落ちた。", "Your wings fall off.");
14161416
14171417 break;
14181418 case 175: case 176: case 177:
1419- muta_class = &(p_ptr->muta3);
1419+ muta_class = &(creature_ptr->muta3);
14201420 muta_which = MUT3_FEARLESS;
14211421 muta_desc = _( "再び恐怖を感じるようになった。", "You begin to feel fear again.");
14221422
14231423 break;
14241424 case 178: case 179:
1425- muta_class = &(p_ptr->muta3);
1425+ muta_class = &(creature_ptr->muta3);
14261426 muta_which = MUT3_REGEN;
14271427 muta_desc = _( "急速回復しなくなった。", "You stop regenerating.");
14281428
14291429 break;
14301430 case 180: case 181:
1431- muta_class = &(p_ptr->muta3);
1431+ muta_class = &(creature_ptr->muta3);
14321432 muta_which = MUT3_ESP;
14331433 muta_desc = _( "テレパシーの能力を失った！", "You lose your telepathic ability!");
14341434
14351435 break;
14361436 case 182: case 183: case 184:
1437- muta_class = &(p_ptr->muta3);
1437+ muta_class = &(creature_ptr->muta3);
14381438 muta_which = MUT3_LIMBER;
14391439 muta_desc = _( "筋肉が硬くなった。", "Your muscles stiffen.");
14401440
14411441 break;
14421442 case 185: case 186: case 187:
1443- muta_class = &(p_ptr->muta3);
1443+ muta_class = &(creature_ptr->muta3);
14441444 muta_which = MUT3_ARTHRITIS;
14451445 muta_desc = _( "関節が痛くなくなった。", "Your joints stop hurting.");
14461446
14471447 break;
14481448 case 188:
1449- muta_class = &(p_ptr->muta3);
1449+ muta_class = &(creature_ptr->muta3);
14501450 muta_which = MUT3_BAD_LUCK;
14511451 muta_desc = _( "黒いオーラは渦巻いて消えた。", "Your black aura swirls and fades.");
14521452
14531453 break;
14541454 case 189:
1455- muta_class = &(p_ptr->muta3);
1455+ muta_class = &(creature_ptr->muta3);
14561456 muta_which = MUT3_VULN_ELEM;
14571457 muta_desc = _( "無防備な感じはなくなった。", "You feel less exposed.");
14581458
14591459 break;
14601460 case 190: case 191: case 192:
1461- muta_class = &(p_ptr->muta3);
1461+ muta_class = &(creature_ptr->muta3);
14621462 muta_which = MUT3_MOTION;
14631463 muta_desc = _( "動作の正確さがなくなった。", "You move with less assurance.");
14641464
14651465 break;
14661466 case 193:
1467- if (p_ptr->pseikaku == SEIKAKU_LUCKY) break;
1468- muta_class = &(p_ptr->muta3);
1467+ if (creature_ptr->pseikaku == SEIKAKU_LUCKY) break;
1468+ muta_class = &(creature_ptr->muta3);
14691469 muta_which = MUT3_GOOD_LUCK;
14701470 muta_desc = _( "白いオーラは輝いて消えた。", "Your white aura shimmers and fades.");
14711471
@@ -1494,9 +1494,9 @@ bool lose_mutation(MUTATION_IDX choose_mut)
14941494 msg_print(muta_desc);
14951495 *(muta_class) &= ~(muta_which);
14961496
1497- p_ptr->update |= PU_BONUS;
1497+ creature_ptr->update |= PU_BONUS;
14981498 handle_stuff();
1499- p_ptr->mutant_regenerate_mod = calc_mutant_regenerate_mod(p_ptr);
1499+ creature_ptr->mutant_regenerate_mod = calc_mutant_regenerate_mod(creature_ptr);
15001500 return TRUE;
15011501 }
15021502 }
--- a/src/mutation.h
+++ b/src/mutation.h
@@ -1,6 +1,6 @@
11 /* mutation.c */
22 extern bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut);
3-extern bool lose_mutation(MUTATION_IDX choose_mut);
3+extern bool lose_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut);
44 extern void lose_all_mutations(player_type *creature_ptr);
55 extern void dump_mutations(player_type *creature_ptr, FILE *OutFile);
66 extern void do_cmd_knowledge_mutations(void);
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -3840,7 +3840,7 @@ void do_poly_self(player_type *creature_ptr)
38403840 /* Polymorph into a less mutated form */
38413841 power -= 10;
38423842
3843- if (!lose_mutation(0))
3843+ if (!lose_mutation(p_ptr, 0))
38443844 msg_print(_("奇妙なくらい普通になった気がする。", "You feel oddly normal."));
38453845 }
38463846
Show on old repository browser