}
/* Return new value */
- return (value);
+ return (s16b)(value);
}
}
else
{
- if (depth_in_feet) (void)sprintf(depths, _("%d ft", "%d ft"), dun_level * 50);
- else (void)sprintf(depths, _("%d 階", "Lev %d"), dun_level);
+ if (depth_in_feet) (void)sprintf(depths, _("%d ft", "%d ft"), (int)dun_level * 50);
+ else (void)sprintf(depths, _("%d 階", "Lev %d"), (int)dun_level);
/* Get color of level based on feeling -JSV- */
switch (p_ptr->feeling)
static void print_monster_line(int x, int y, monster_type* m_ptr, int n_same){
char buf[256];
int i;
- int r_idx = m_ptr->ap_r_idx;
+ MONRACE_IDX r_idx = m_ptr->ap_r_idx;
monster_race* r_ptr = &r_info[r_idx];
Term_gotoxy(x, y);
Term_add_bigch(r_ptr->x_attr, r_ptr->x_char);
//LV
if (r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG2_KAGE)){
- sprintf(buf, " %2d", r_ptr->level);
+ sprintf(buf, " %2d", (int)r_ptr->level);
}else{
strcpy(buf, " ??");
}
if(!m_ptr->r_idx)continue;//dead?
{
/*
- int r_idx = m_ptr->ap_r_idx;
+ MONRACE_IDX r_idx = m_ptr->ap_r_idx;
monster_race* r_ptr = &r_info[r_idx];
cptr name = (r_name + r_ptr->name);
cptr ename = (r_name + r_ptr->name);
Term_clear();
- target_set_prepare_look(); //モンスター一覧を生成,ソート
+ target_set_prepare_look();//モンスター一覧を生成,ソート
print_monster_list(0, 0, h);
/* Fresh */
int num_boukyaku = 0;
const magic_type *s_ptr;
- int which;
+ REALM_IDX which;
int bonus = 0;
k++;
}
if (k > 32) k = 32;
- if ((p_ptr->new_spells > k) && ((mp_ptr->spell_book == TV_LIFE_BOOK) || (mp_ptr->spell_book == TV_HISSATSU_BOOK))) p_ptr->new_spells = k;
+ if ((p_ptr->new_spells > k) &&
+ ((mp_ptr->spell_book == TV_LIFE_BOOK) || (mp_ptr->spell_book == TV_HISSATSU_BOOK)))
+ {
+ p_ptr->new_spells = (s16b)k;
+ }
}
if (p_ptr->new_spells < 0) p_ptr->new_spells = 0;
if (have_flag(flgs, TR_LITE_M1)) rad -= 1;
if (have_flag(flgs, TR_LITE_M2)) rad -= 2;
if (have_flag(flgs, TR_LITE_M3)) rad -= 3;
- p_ptr->cur_lite += rad;
+ p_ptr->cur_lite += (s16b)rad;
}
/* max radius is 14 (was 5) without rewriting other code -- */
int extra_shots = 0;
int i;
int num = 0;
- int tval_ammo = bow_tval_ammo(o_ptr);
+ OBJECT_TYPE_VALUE tval_ammo = bow_tval_ammo(o_ptr);
object_type *q_ptr;
u32b flgs[TR_FLAG_SIZE];
num += (p_ptr->lev * 4);
}
}
- return num;
+ return (s16b)num;
}
/*!
bool old_mighty_throw = p_ptr->mighty_throw;
/* Save the old armor class */
- bool old_dis_ac = p_ptr->dis_ac;
- bool old_dis_to_a = p_ptr->dis_to_a;
+ s16b old_dis_ac = p_ptr->dis_ac;
+ s16b old_dis_to_a = p_ptr->dis_to_a;
/* Clear extra blows/shots */
/* To Bow and Natural attack */
/* Apply the bonuses to hit/damage */
- p_ptr->to_h_b += bonus_to_h;
- p_ptr->to_h_m += bonus_to_h;
- p_ptr->to_d_m += bonus_to_d;
+ p_ptr->to_h_b += (s16b)bonus_to_h;
+ p_ptr->to_h_m += (s16b)bonus_to_h;
+ p_ptr->to_d_m += (s16b)bonus_to_d;
/* Apply the mental bonuses tp hit/damage, if known */
- if (object_is_known(o_ptr)) p_ptr->dis_to_h_b += bonus_to_h;
+ if (object_is_known(o_ptr)) p_ptr->dis_to_h_b += (s16b)bonus_to_h;
/* To Melee */
if ((i == INVEN_LEFT || i == INVEN_RIGHT) && !p_ptr->ryoute)
{
/* Apply the bonuses to hit/damage */
- p_ptr->to_h[i-INVEN_RIGHT] += bonus_to_h;
- p_ptr->to_d[i-INVEN_RIGHT] += bonus_to_d;
+ p_ptr->to_h[i-INVEN_RIGHT] += (s16b)bonus_to_h;
+ p_ptr->to_d[i-INVEN_RIGHT] += (s16b)bonus_to_d;
/* Apply the mental bonuses tp hit/damage, if known */
if (object_is_known(o_ptr))
{
- p_ptr->dis_to_h[i-INVEN_RIGHT] += bonus_to_h;
- p_ptr->dis_to_d[i-INVEN_RIGHT] += bonus_to_d;
+ p_ptr->dis_to_h[i-INVEN_RIGHT] += (s16b)bonus_to_h;
+ p_ptr->dis_to_d[i-INVEN_RIGHT] += (s16b)bonus_to_d;
}
}
else if (p_ptr->migite && p_ptr->hidarite)
else
{
/* Apply the bonuses to hit/damage */
- p_ptr->to_h[default_hand] += bonus_to_h;
- p_ptr->to_d[default_hand] += bonus_to_d;
+ p_ptr->to_h[default_hand] += (s16b)bonus_to_h;
+ p_ptr->to_d[default_hand] += (s16b)bonus_to_d;
/* Apply the mental bonuses to hit/damage, if known */
if (object_is_known(o_ptr))
{
- p_ptr->dis_to_h[default_hand] += bonus_to_h;
- p_ptr->dis_to_d[default_hand] += bonus_to_d;
+ p_ptr->dis_to_h[default_hand] += (s16b)bonus_to_h;
+ p_ptr->dis_to_d[default_hand] += (s16b)bonus_to_d;
}
}
}
ac += 5;
if (o_ptr->curse_flags & TRC_HEAVY_CURSE) ac += 7;
if (o_ptr->curse_flags & TRC_PERMA_CURSE) ac += 13;
- p_ptr->to_a += ac;
- p_ptr->dis_to_a += ac;
+ p_ptr->to_a += (s16b)ac;
+ p_ptr->dis_to_a += (s16b)ac;
}
}
if (p_ptr->stat_top[i] != top)
{
/* Save the new value */
- p_ptr->stat_top[i] = top;
+ p_ptr->stat_top[i] = (s16b)top;
/* Redisplay the stats later */
p_ptr->redraw |= (PR_STATS);
if (p_ptr->stat_use[i] != use)
{
/* Save the new value */
- p_ptr->stat_use[i] = use;
+ p_ptr->stat_use[i] = (s16b)use;
/* Redisplay the stats later */
p_ptr->redraw |= (PR_STATS);
if (p_ptr->stat_ind[i] != ind)
{
/* Save the new index */
- p_ptr->stat_ind[i] = ind;
+ p_ptr->stat_ind[i] = (s16b)ind;
/* Change in CON affects Hitpoints */
if (i == A_CON)
}
if (inventory[INVEN_RARM].tval == TV_POLEARM) penalty1 += 10;
if (inventory[INVEN_LARM].tval == TV_POLEARM) penalty2 += 10;
- p_ptr->to_h[0] -= penalty1;
- p_ptr->to_h[1] -= penalty2;
- p_ptr->dis_to_h[0] -= penalty1;
- p_ptr->dis_to_h[1] -= penalty2;
+ p_ptr->to_h[0] -= (s16b)penalty1;
+ p_ptr->to_h[1] -= (s16b)penalty2;
+ p_ptr->dis_to_h[0] -= (s16b)penalty1;
+ p_ptr->dis_to_h[1] -= (s16b)penalty2;
}
/* Extract the current weight (in tenth pounds) */
/* Compute "extra shots" if needed */
if (o_ptr->k_idx)
{
- p_ptr->tval_ammo = bow_tval_ammo(o_ptr);
+ p_ptr->tval_ammo = (byte_hack)bow_tval_ammo(o_ptr);
/* Apply special flags */
if (o_ptr->k_idx && !p_ptr->heavy_shoot)
p_ptr->num_blow[i] = blows_table[str_index][dex_index];
/* Maximal value */
- if (p_ptr->num_blow[i] > num) p_ptr->num_blow[i] = num;
+ if (p_ptr->num_blow[i] > num) p_ptr->num_blow[i] = (s16b)num;
/* Add in the "bonus blows" */
- p_ptr->num_blow[i] += extra_blows[i];
+ p_ptr->num_blow[i] += (s16b)extra_blows[i];
if (p_ptr->pclass == CLASS_WARRIOR) p_ptr->num_blow[i] += (p_ptr->lev / 40);
penalty += 30;
if (penalty < 30) penalty = 30;
}
- p_ptr->to_h[i] -= penalty;
- p_ptr->dis_to_h[i] -= penalty;
+ p_ptr->to_h[i] -= (s16b)penalty;
+ p_ptr->dis_to_h[i] -= (s16b)penalty;
/* Riding weapon */
p_ptr->riding_wield[i] = TRUE;
if (penalty < 30) penalty = 30;
}
if (p_ptr->tval_ammo == TV_BOLT) penalty *= 2;
- p_ptr->to_h_b -= penalty;
- p_ptr->dis_to_h_b -= penalty;
+ p_ptr->to_h_b -= (s16b)penalty;
+ p_ptr->dis_to_h_b -= (s16b)penalty;
}
/* Different calculation for monks with empty hands */
if (blow_base > 31) p_ptr->num_blow[0]++;
if (blow_base > 44) p_ptr->num_blow[0]++;
if (blow_base > 58) p_ptr->num_blow[0]++;
- if (p_ptr->magic_num1[0])
+ if (P_PTR_KI)
{
- p_ptr->to_d[0] += (p_ptr->magic_num1[0]/5);
- p_ptr->dis_to_d[0] += (p_ptr->magic_num1[0]/5);
+ p_ptr->to_d[0] += P_PTR_KI / 5;
+ p_ptr->dis_to_d[0] += P_PTR_KI / 5;
}
}
else
{
if (buki_motteruka(INVEN_RARM+i))
{
- int tval = inventory[INVEN_RARM+i].tval - TV_WEAPON_BEGIN;
- int sval = inventory[INVEN_RARM+i].sval;
+ OBJECT_TYPE_VALUE tval = inventory[INVEN_RARM+i].tval - TV_WEAPON_BEGIN;
+ OBJECT_SUBTYPE_VALUE sval = inventory[INVEN_RARM+i].sval;
p_ptr->to_h[i] += (p_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200;
p_ptr->dis_to_h[i] += (p_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200;
/* Check if the game has started */
if (start_time != 0)
{
- u32b tmp = time(NULL);
+ u32b tmp = (u32b)time(NULL);
playtime += (tmp - start_time);
start_time = tmp;
}