変愚蛮怒のメインリポジトリです
Revision | b2f6dd338a440334be38039054a694b85d46c614 (tree) |
---|---|
Time | 2018-12-12 22:31:46 |
Author | Deskull <deskull@user...> |
Commiter | Deskull |
[Refactor] #37353 コメント整理 / Refactor comments.
@@ -1489,8 +1489,6 @@ bool activate_artifact(object_type *o_ptr) | ||
1489 | 1489 | /* Confusing. */ |
1490 | 1490 | (void)set_confused(p_ptr->confused + randint1(5 * oops + 1)); |
1491 | 1491 | } |
1492 | - | |
1493 | - /* Redraw mana */ | |
1494 | 1492 | p_ptr->redraw |= (PR_MANA); |
1495 | 1493 | } |
1496 | 1494 | take_hit(DAMAGE_LOSELIFE, damroll(1, 12), _("危険な秘密", "perilous secrets"), -1); |
@@ -1081,8 +1081,6 @@ void do_cmd_cast(void) | ||
1081 | 1081 | p_ptr->csp -= need_mana; |
1082 | 1082 | } |
1083 | 1083 | else over_exerted = TRUE; |
1084 | - | |
1085 | - /* Redraw mana */ | |
1086 | 1084 | p_ptr->redraw |= (PR_MANA); |
1087 | 1085 | |
1088 | 1086 | /* Failed spell */ |
@@ -371,8 +371,6 @@ void do_cmd_hissatsu(void) | ||
371 | 371 | |
372 | 372 | /* Limit */ |
373 | 373 | if (p_ptr->csp < 0) p_ptr->csp = 0; |
374 | - | |
375 | - /* Redraw mana */ | |
376 | 374 | p_ptr->redraw |= (PR_MANA); |
377 | 375 | |
378 | 376 | p_ptr->window |= (PW_PLAYER); |
@@ -3291,8 +3291,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
3291 | 3291 | msg_format(_("%^sに反撃した!", "Your counterattack to %s!"), m_target_name); |
3292 | 3292 | py_attack(m_ptr->fy, m_ptr->fx, HISSATSU_COUNTER); |
3293 | 3293 | fear = FALSE; |
3294 | - | |
3295 | - /* Redraw mana */ | |
3296 | 3294 | p_ptr->redraw |= (PR_MANA); |
3297 | 3295 | } |
3298 | 3296 |
@@ -1813,22 +1813,22 @@ void do_cmd_mind(void) | ||
1813 | 1813 | #ifdef JP |
1814 | 1814 | switch(p_ptr->pclass) |
1815 | 1815 | { |
1816 | - case CLASS_MINDCRAFTER: use_mind = MIND_MINDCRAFTER;p = "精神";break; | |
1817 | - case CLASS_FORCETRAINER: use_mind = MIND_KI;p = "気";break; | |
1818 | - case CLASS_BERSERKER: use_mind = MIND_BERSERKER;p = "怒り";break; | |
1819 | - case CLASS_MIRROR_MASTER: use_mind = MIND_MIRROR_MASTER;p = "鏡魔法";break; | |
1820 | - case CLASS_NINJA: use_mind = MIND_NINJUTSU;p = "精神";break; | |
1821 | - default: use_mind = 0;p = "超能力";break; | |
1816 | + case CLASS_MINDCRAFTER: use_mind = MIND_MINDCRAFTER; p = "精神";break; | |
1817 | + case CLASS_FORCETRAINER: use_mind = MIND_KI; p = "気";break; | |
1818 | + case CLASS_BERSERKER: use_mind = MIND_BERSERKER; p = "怒り";break; | |
1819 | + case CLASS_MIRROR_MASTER: use_mind = MIND_MIRROR_MASTER; p = "鏡魔法";break; | |
1820 | + case CLASS_NINJA: use_mind = MIND_NINJUTSU; p = "精神";break; | |
1821 | + default: use_mind = 0 ;p = "超能力"; break; | |
1822 | 1822 | } |
1823 | 1823 | #else |
1824 | 1824 | switch(p_ptr->pclass) |
1825 | 1825 | { |
1826 | - case CLASS_MINDCRAFTER: use_mind = MIND_MINDCRAFTER;break; | |
1827 | - case CLASS_FORCETRAINER: use_mind = MIND_KI;break; | |
1828 | - case CLASS_BERSERKER: use_mind = MIND_BERSERKER;break; | |
1829 | - case CLASS_MIRROR_MASTER: use_mind = MIND_MIRROR_MASTER;break; | |
1830 | - case CLASS_NINJA: use_mind = MIND_NINJUTSU;break; | |
1831 | - default: use_mind = 0;break; | |
1826 | + case CLASS_MINDCRAFTER: use_mind = MIND_MINDCRAFTER; break; | |
1827 | + case CLASS_FORCETRAINER: use_mind = MIND_KI; break; | |
1828 | + case CLASS_BERSERKER: use_mind = MIND_BERSERKER; break; | |
1829 | + case CLASS_MIRROR_MASTER: use_mind = MIND_MIRROR_MASTER; break; | |
1830 | + case CLASS_NINJA: use_mind = MIND_NINJUTSU; break; | |
1831 | + default: use_mind = 0; break; | |
1832 | 1832 | } |
1833 | 1833 | #endif |
1834 | 1834 | spell = mind_powers[use_mind].info[n]; |
@@ -2081,10 +2081,7 @@ void do_cmd_mind(void) | ||
2081 | 2081 | (void)dec_stat(A_WIS, 15 + randint1(10), perm); |
2082 | 2082 | } |
2083 | 2083 | } |
2084 | - | |
2085 | - /* Redraw mana */ | |
2086 | 2084 | p_ptr->redraw |= (PR_MANA); |
2087 | - | |
2088 | 2085 | p_ptr->window |= (PW_PLAYER); |
2089 | 2086 | p_ptr->window |= (PW_SPELL); |
2090 | 2087 | } |
@@ -923,8 +923,6 @@ static bool cmd_racial_power_aux(s32b command) | ||
923 | 923 | p_ptr->csp = p_ptr->msp; |
924 | 924 | p_ptr->csp_frac = 0; |
925 | 925 | } |
926 | - | |
927 | - /* Redraw mana */ | |
928 | 926 | p_ptr->redraw |= (PR_MANA); |
929 | 927 | break; |
930 | 928 | } |
@@ -1019,8 +1017,6 @@ static bool cmd_racial_power_aux(s32b command) | ||
1019 | 1017 | p_ptr->csp = max_csp; |
1020 | 1018 | p_ptr->csp_frac = 0; |
1021 | 1019 | } |
1022 | - | |
1023 | - /* Redraw mana */ | |
1024 | 1020 | p_ptr->redraw |= (PR_MANA); |
1025 | 1021 | } |
1026 | 1022 | else if (command == -4) |
@@ -1129,8 +1125,6 @@ static bool cmd_racial_power_aux(s32b command) | ||
1129 | 1125 | p_ptr->csp = p_ptr->msp; |
1130 | 1126 | p_ptr->csp_frac = 0; |
1131 | 1127 | } |
1132 | - | |
1133 | - /* Redraw mana */ | |
1134 | 1128 | p_ptr->redraw |= (PR_MANA); |
1135 | 1129 | } |
1136 | 1130 | else |
@@ -191,22 +191,13 @@ void check_hex(void) | ||
191 | 191 | p_ptr->redraw |= PR_MANA; |
192 | 192 | if (res) |
193 | 193 | { |
194 | -#ifdef JP | |
195 | - msg_print("詠唱を再開した。"); | |
196 | -#else | |
197 | - msg_print("You restart spelling."); | |
198 | -#endif | |
194 | + msg_print(_("詠唱を再開した。", "You restart spelling.")); | |
195 | + | |
199 | 196 | p_ptr->action = ACTION_SPELL; |
200 | 197 | |
201 | - /* Recalculate bonuses */ | |
202 | 198 | p_ptr->update |= (PU_BONUS | PU_HP); |
203 | - | |
204 | - /* Redraw map and status bar */ | |
205 | 199 | p_ptr->redraw |= (PR_MAP | PR_STATUS | PR_STATE); |
206 | - | |
207 | - /* Update monsters */ | |
208 | 200 | p_ptr->update |= (PU_MONSTERS); |
209 | - | |
210 | 201 | p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); |
211 | 202 | } |
212 | 203 | } |
@@ -247,14 +238,9 @@ void check_hex(void) | ||
247 | 238 | bool hex_spell_fully(void) |
248 | 239 | { |
249 | 240 | int k_max = 0; |
250 | - | |
251 | 241 | k_max = (p_ptr->lev / 15) + 1; |
252 | - | |
253 | - /* Paranoia */ | |
254 | 242 | k_max = MIN(k_max, MAX_KEEP); |
255 | - | |
256 | 243 | if (CASTING_HEX_NUM(p_ptr) < k_max) return FALSE; |
257 | - | |
258 | 244 | return TRUE; |
259 | 245 | } |
260 | 246 |
@@ -592,10 +592,6 @@ void do_cmd_snipe(void) | ||
592 | 592 | cast = cast_sniper_spell(n); |
593 | 593 | |
594 | 594 | if (!cast) return; |
595 | -#if 0 | |
596 | - p_ptr->energy_use = 100; | |
597 | -#endif | |
598 | - /* Redraw mana */ | |
599 | 595 | p_ptr->redraw |= (PR_HP | PR_MANA); |
600 | 596 | |
601 | 597 | p_ptr->window |= (PW_PLAYER); |
@@ -5946,8 +5946,6 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO | ||
5946 | 5946 | } |
5947 | 5947 | |
5948 | 5948 | learn_spell(monspell); |
5949 | - | |
5950 | - /* Redraw mana */ | |
5951 | 5949 | p_ptr->redraw |= (PR_MANA); |
5952 | 5950 | |
5953 | 5951 | p_ptr->window |= (PW_PLAYER); |