/* Update monsters */
p_ptr->update |= (PU_MONSTERS);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
p_ptr->energy_need += ENERGY_NEED();
if (!notice)
return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 1);
+ if (disturb_state) disturb(FALSE, TRUE);
/* Redraw title */
p_ptr->redraw |= (PR_BASIC | PR_STATUS);
p_ptr->update |= (PU_BONUS | PU_HP);
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Fully update the visuals */
p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE | PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
/* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Redraw the state */
p_ptr->redraw |= (PR_STATE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 1);
+ if (disturb_state) disturb(FALSE, TRUE);
/* Redraw map */
p_ptr->redraw |= (PR_MAP);
/* Update monsters */
p_ptr->update |= (PU_MONSTERS);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/*!
* @brief 狂戦士化の継続時間をセットする / Set "p_ptr->shero", notice observable changes
- * @param v 継続時間
- * @param do_dec 現在の継続時間より長い値のみ上書きする
+ * @param v 継続時間/ 0ならば無条件にリセット
+ * @param do_dec FALSEの場合現在の継続時間より長い値のみ上書きする
* @return ステータスに影響を及ぼす変化があった場合TRUEを返す。
*/
bool set_shero(TIME_EFFECT v, bool do_dec)
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Update monsters */
p_ptr->update |= (PU_MONSTERS);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
}
}
/* Update monsters */
p_ptr->update |= (PU_MONSTERS);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
}
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Update monsters */
p_ptr->update |= (PU_MONSTERS);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
}
}
/* Update monsters */
p_ptr->update |= (PU_MONSTERS);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
p_ptr->energy_need += ENERGY_NEED();
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
-
- /* Result */
+ if (disturb_state) disturb(FALSE, FALSE);
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
#endif
}
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
#endif
}
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Hex */
if (hex_spelling_any()) stop_hex_spell_all();
- /* Notice */
notice = TRUE;
}
switch (new_aux)
{
/* None */
- case 0:
+ case 0:
msg_print(_("やっと朦朧状態から回復した。", "You are no longer stunned."));
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
break;
}
- /* Notice */
notice = TRUE;
}
/* No change */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
case 7: msg_print(_("致命的な傷を負ってしまった。", "You have been given a mortal wound.")); break;
}
- /* Notice */
notice = TRUE;
if (randint1(1000) < v || one_in_(16))
case 0:
msg_format(_("やっと%s。", "You are no longer bleeding."), p_ptr->prace == RACE_ANDROID ? "怪我が直った" : "出血が止まった");
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
break;
}
- /* Notice */
notice = TRUE;
}
/* No change */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
* 7500 food units, without overflowing the 32767 maximum limit.\n
*\n
* Perhaps we should disturb the player with various messages,
- * especially messages about hunger status changes. XXX XXX XXX\n
+ * especially messages about hunger status changes. \n
*\n
* Digestion of food is handled in "dungeon.c", in which, normally,
* the player digests about 20 food units per 100 game turns, more
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
p_ptr->update |= (PU_BONUS);
}
- /* Done */
return (res);
}
{
int vir;
vir = virtue_number(V_VITALITY);
- if (vir)
+
+ if(num <= 0) return (FALSE);
+
+ if(vir)
{
num = num * (p_ptr->virtues[vir - 1] + 1250) / 1250;
}
/* Redraw */
p_ptr->redraw |= (PR_HP);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
/* Heal 0-4 */
msg_print(_("ひじょうに気分が良くなった。", "You feel very good."));
}
- /* Notice */
return (TRUE);
}
/* Sustain */
if (sust && (!ironman_nightmare || randint0(13)))
{
- /* Message */
msg_format(_("%sなった気がしたが、すぐに元に戻った。", "You feel %s for a moment, but the feeling passes."),
desc_stat_neg[stat]);
/* Attempt to reduce the stat */
if (dec_stat(stat, 10, (ironman_nightmare && !randint0(13))))
{
- /* Message */
msg_format(_("ひどく%sなった気がする。", "You feel very %s."), desc_stat_neg[stat]);
/* Notice effect */
/* Attempt to increase */
if (res_stat(stat))
{
- /* Message */
msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]);
- /* Notice */
return (TRUE);
}
else if (stat == A_CON)
chg_virtue(V_VITALITY, 1);
- /* Message */
msg_format(_("ワーオ!とても%sなった!", "Wow! You feel very %s!"), desc_stat_pos[stat]);
- /* Notice */
return (TRUE);
}
/* Restoration worked */
if (res)
{
- /* Message */
msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]);
- /* Notice */
return (TRUE);
}
/* Restore experience */
if (p_ptr->exp < p_ptr->max_exp)
{
- /* Message */
msg_print(_("経験値が戻ってきた気がする。", "You feel your experience returning."));
/* Restore the experience */
return (FALSE);
}
-
/*
* Forget everything
*/
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* Window stuff */
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
/* Mega-Hack -- Forget the map */
}
else
{
- p_ptr->old_race2 |= 1L << (p_ptr->prace-32);
+ p_ptr->old_race2 |= 1L << (p_ptr->prace - 32);
}
p_ptr->prace = new_race;
rp_ptr = &race_info[p_ptr->prace];
/*
* Decreases players hit points and sets death flag if necessary
*
- * XXX XXX XXX Invulnerability needs to be changed into a "shield"
+ * Invulnerability needs to be changed into a "shield"
*
- * XXX XXX XXX Hack -- this function allows the user to save (or quit)
+ * Hack -- this function allows the user to save (or quit)
* the game when he dies, since the "You die." message is shown before
* setting the player to "dead".
*/
if (damage_type != DAMAGE_USELIFE)
{
- /* Disturb */
- disturb(1, 1);
+ disturb(TRUE, TRUE);
if (auto_more)
{
now_damaged = TRUE;
/* Display the hitpoints */
p_ptr->redraw |= (PR_HP);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
if (damage_type != DAMAGE_GENO && p_ptr->chp == 0)
if(!save_player()) msg_print("セーブ失敗!");
#endif
- /* Sound */
sound(SOUND_DEATH);
chg_virtue(V_SACRIFICE, 10);
}
else
{
- int q_idx = quest_number(dun_level);
+ QUEST_IDX q_idx = quest_number(dun_level);
bool seppuku = streq(hit_from, "Seppuku");
bool winning_seppuku = p_ptr->total_winner && seppuku;
now_damaged = TRUE;
}
- /* Message */
msg_print(_("*** 警告:低ヒット・ポイント! ***", "*** LOW HITPOINT WARNING! ***"));
msg_print(NULL);
flush();
object_type forge;
object_type *q_ptr = &forge;
u32b value, exp;
- int level = MAX(k_info[o_ptr->k_idx].level - 8, 1);
+ DEPTH level = MAX(k_info[o_ptr->k_idx].level - 8, 1);
if ((i == INVEN_RIGHT) || (i == INVEN_LEFT) || (i == INVEN_NECK) || (i == INVEN_LITE)) continue;
if (!o_ptr->k_idx) continue;
-
- /* Wipe the object */
object_wipe(q_ptr);
object_copy(q_ptr, o_ptr);
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}
/* Nothing to notice */
if (!notice) return (FALSE);
- /* Disturb */
- if (disturb_state) disturb(0, 0);
+ if (disturb_state) disturb(FALSE, FALSE);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Handle stuff */
handle_stuff();
-
- /* Result */
return (TRUE);
}