[Refactor] #37353 型の置換(C_MAKE)。 / Type replacement(C_MAKE).

[hengband/hengband.git] / src / cmd5.c

diff --git a/src/cmd5.c b/src/cmd5.c
index 92a0a11..ede88af 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -18,7 +18,7 @@
  * @param tval 魔法書のtval
  * @return 領域魔法の技能名称を保管した文字列ポインタ
  */
-cptr spell_category_name(OBJECT_TYPE_VALUE tval)
+concptr spell_category_name(OBJECT_TYPE_VALUE tval)
 {
        switch (tval)
        {
@@ -50,19 +50,19 @@ cptr spell_category_name(OBJECT_TYPE_VALUE tval)
  * The "known" should be TRUE for cast/pray, FALSE for study
  * </pre>
  */
-static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm)
+static int get_spell(SPELL_IDX *sn, concptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm)
 {
-       int         i;
+       int i;
        SPELL_IDX   spell = -1;
-       int         num = 0;
-       int         ask = TRUE;
-       MANA_POINT  need_mana;
-       SPELL_IDX   spells[64];
-       bool        flag, redraw, okay;
-       char        choice;
+       int num = 0;
+       int ask = TRUE;
+       MANA_POINT need_mana;
+       SPELL_IDX spells[64];
+       bool flag, redraw, okay;
+       char choice;
        const magic_type  *s_ptr;
-       char        out_val[160];
-       cptr        p;
+       char out_val[160];
+       concptr p;
        COMMAND_CODE code;
 #ifdef JP
        char jverb_buf[128];
@@ -434,7 +434,7 @@ void do_cmd_browse(void)
 
        object_type     *o_ptr;
 
-       cptr q, s;
+       concptr q, s;
 
        /* Warriors are illiterate */
        if (!(p_ptr->realm1 || p_ptr->realm2) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_RED_MAGE))
@@ -570,7 +570,7 @@ static void change_realm2(CHARACTER_IDX next_realm)
        p_ptr->old_realm |= 1 << (p_ptr->realm2-1);
        p_ptr->realm2 = next_realm;
 
-       p_ptr->notice |= (PN_REORDER);
+       p_ptr->update |= (PU_REORDER);
        p_ptr->update |= (PU_SPELLS);
        handle_stuff();
 
@@ -595,11 +595,11 @@ void do_cmd_study(void)
        /* Spells of realm2 will have an increment of +32 */
        SPELL_IDX spell = -1;
 
-       cptr p = spell_category_name(mp_ptr->spell_book);
+       concptr p = spell_category_name(mp_ptr->spell_book);
 
        object_type *o_ptr;
 
-       cptr q, s;
+       concptr q, s;
 
        if (!p_ptr->realm1)
        {
@@ -732,7 +732,7 @@ void do_cmd_study(void)
                int max_exp = (spell < 32) ? SPELL_EXP_MASTER : SPELL_EXP_EXPERT;
                int old_exp = p_ptr->spell_exp[spell];
                int new_rank = EXP_LEVEL_UNSKILLED;
-               cptr name = do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell%32, SPELL_NAME);
+               concptr name = do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell%32, SPELL_NAME);
 
                if (old_exp >= max_exp)
                {
@@ -823,10 +823,10 @@ void do_cmd_study(void)
 
        /* One less spell available */
        p_ptr->learned_spells++;
-#
+
        /* Update Study */
        p_ptr->update |= (PU_SPELLS);
-       handle_stuff();
+       update_creature(p_ptr);
 
        /* Redraw object recall */
        p_ptr->window |= (PW_OBJECT);
@@ -849,10 +849,10 @@ void do_cmd_cast(void)
        REALM_IDX use_realm;
        MANA_POINT need_mana;
 
-       cptr prayer;
+       concptr prayer;
        object_type     *o_ptr;
        const magic_type *s_ptr;
-       cptr q, s;
+       concptr q, s;
 
        bool over_exerted = FALSE;