X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fxtra2.c;h=1f54bd4efac5872986bdab1074473a45e94904e6;hb=1c750bbc037ebf3dfd1f1ff6f3f511530070c241;hp=a80cefff882588965d9f07ae7b3ba6e2dcca8132;hpb=25b83c6445cbe3397da37b4ff4a0a680d466f7ac;p=hengband%2Fhengband.git diff --git a/src/xtra2.c b/src/xtra2.c index a80cefff8..1f54bd4ef 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -27,7 +27,7 @@ void check_experience(void) bool level_mutation = FALSE; bool level_inc_stat = FALSE; bool android = (p_ptr->prace == RACE_ANDROID ? TRUE : FALSE); - int old_lev = p_ptr->lev; + PLAYER_LEVEL old_lev = p_ptr->lev; /* Hack -- lower limit */ if (p_ptr->exp < 0) p_ptr->exp = 0; @@ -792,7 +792,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item) { if (r_ptr->blow[i].method == RBM_EXPLODE) { - int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL; + BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL; int typ = mbe_info[r_ptr->blow[i].effect].explode_type; DICE_NUMBER d_dice = r_ptr->blow[i].d_dice; DICE_SID d_side = r_ptr->blow[i].d_side; @@ -924,7 +924,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item) { int wy = y, wx = x; bool pet = is_pet(m_ptr); - u32b mode = 0L; + BIT_FLAGS mode = 0L; if (pet) mode |= PM_FORCE_PET; @@ -1001,7 +1001,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item) if (attempts > 0) { - u32b mode = 0L; + BIT_FLAGS mode = 0L; if (pet) mode |= PM_FORCE_PET; if (summon_specific((pet ? -1 : m_idx), wy, wx, 100, SUMMON_DAWN, mode)) @@ -1017,7 +1017,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item) case MON_UNMAKER: /* One more ultra-hack: An Unmaker goes out with a big bang! */ { - int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL; + BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL; (void)project(m_idx, 6, y, x, 100, GF_CHAOS, flg, -1); } break; @@ -1132,7 +1132,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item) case MON_ROLENTO: { - int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL; + BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL; (void)project(m_idx, 3, y, x, damroll(20, 10), GF_FIRE, flg, -1); } break; @@ -1940,7 +1940,7 @@ msg_format("%sを葬り去った。", m_name); { int dummy_y = m_ptr->fy; int dummy_x = m_ptr->fx; - u32b mode = 0L; + BIT_FLAGS mode = 0L; if (is_pet(m_ptr)) mode |= PM_FORCE_PET; @@ -2338,7 +2338,7 @@ void verify_panel(void) /* * Monster health description */ -cptr look_mon_desc(monster_type *m_ptr, u32b mode) +cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode) { monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx]; bool living; @@ -2720,13 +2720,11 @@ static void ang_sort_swap_distance(vptr u, vptr v, int a, int b) /* * Hack -- help "select" a location (see below) */ -static s16b target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION dx) +static POSITION_IDX target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION dx) { - int i, v; - - int x2, y2, x3, y3, x4, y4; - - int b_i = -1, b_v = 9999; + POSITION_IDX i, v; + POSITION x2, y2, x3, y3, x4, y4; + POSITION_IDX b_i = -1, b_v = 9999; /* Scan the locations */ @@ -2836,7 +2834,7 @@ static bool target_set_accept(int y, int x) * * Return the number of target_able monsters in the set. */ -static void target_set_prepare(int mode) +static void target_set_prepare(BIT_FLAGS mode) { int y, x; int min_hgt, max_hgt, min_wid, max_wid; @@ -2998,7 +2996,7 @@ bool show_gold_on_floor = FALSE; * * This function must handle blindness/hallucination. */ -static int target_set_aux(int y, int x, int mode, cptr info) +static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info) { cave_type *c_ptr = &cave[y][x]; s16b this_o_idx, next_o_idx = 0; @@ -3006,11 +3004,12 @@ static int target_set_aux(int y, int x, int mode, cptr info) bool boring = TRUE; s16b feat; feature_type *f_ptr; - int query = '\001'; + char query = '\001'; char out_val[MAX_NLEN+80]; #ifdef ALLOW_EASY_FLOOR - int floor_list[23], floor_num = 0; + OBJECT_IDX floor_list[23]; + ITEM_NUMBER floor_num = 0; /* Scan all objects in the grid */ if (easy_floor) @@ -3264,10 +3263,10 @@ static int target_set_aux(int y, int x, int mode, cptr info) /* Display rough information about items */ #ifdef JP sprintf(out_val, "%s %d個のアイテム%s%s ['x'で一覧, %s]", - s1, floor_num, s2, s3, info); + s1, (int)floor_num, s2, s3, info); #else sprintf(out_val, "%s%s%sa pile of %d items [x,%s]", - s1, s2, s3, floor_num, info); + s1, s2, s3, (int)floor_num, info); #endif prt(out_val, 0, 0); @@ -3300,10 +3299,10 @@ static int target_set_aux(int y, int x, int mode, cptr info) /* Prompt */ #ifdef JP sprintf(out_val, "%s %d個のアイテム%s%s [Enterで次へ, %s]", - s1, floor_num, s2, s3, info); + s1, (int)floor_num, s2, s3, info); #else sprintf(out_val, "%s%s%sa pile of %d items [Enter,%s]", - s1, s2, s3, floor_num, info); + s1, s2, s3, (int)floor_num, info); #endif prt(out_val, 0, 0); @@ -3580,7 +3579,7 @@ static int target_set_aux(int y, int x, int mode, cptr info) * This command will cancel any old target, even if used from * inside the "look" command. */ -bool target_set(int mode) +bool target_set(BIT_FLAGS mode) { int i, d, m, t, bd; POSITION y = p_ptr->y; @@ -3889,7 +3888,7 @@ bool target_set(int mode) strcpy(info, _("q止 t決 p自 m近 +次 -前", "q,t,p,m,+,-,")); /* Describe and Prompt (enable "TARGET_LOOK") */ - while (!(query = target_set_aux(y, x, mode | TARGET_LOOK, info))); + while ((query = target_set_aux(y, x, mode | TARGET_LOOK, info)) == 0); /* Cancel tracking */ /* health_track(0); */ @@ -5525,12 +5524,14 @@ s16b gain_energy(void) } -/* - * Return bow energy +/*! + * @brief 射撃武器の攻撃に必要な基本消費エネルギーを返す/Return bow energy + * @param sval 射撃武器のアイテム副分類ID + * @return 消費する基本エネルギー */ -s16b bow_energy(OBJECT_SUBTYPE_VALUE sval) +ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval) { - int energy = 100; + ENERGY energy = 10000; /* Analyze the launcher */ switch (sval) @@ -5732,7 +5733,7 @@ cptr rumor_bind_name(char *base, cptr fullname) void display_rumor(bool ex) { - bool err; + errr err; int section = 0; char Rumor[1024];