option_info[i].o_text &&
streq(option_info[i].o_text, buf + 2))
{
- if (alive && 6 == option_info[i].o_page && !wizard)
+ if (p_ptr->playing && 6 == option_info[i].o_page && !p_ptr->wizard)
{
#ifdef JP
msg_format("½é´ü¥ª¥×¥·¥ç¥ó¤ÏÊѹ¹¤Ç¤¤Þ¤»¤ó! '%s'", buf);
option_info[i].o_text &&
streq(option_info[i].o_text, buf + 2))
{
- if (alive && 6 == option_info[i].o_page && !wizard)
+ if (p_ptr->playing && 6 == option_info[i].o_page && !p_ptr->wizard)
{
#ifdef JP
msg_format("½é´ü¥ª¥×¥·¥ç¥ó¤ÏÊѹ¹¤Ç¤¤Þ¤»¤ó! '%s'", buf);
if (object_known_p(o_ptr)) show_todam += o_ptr->to_d;
if ((o_ptr->sval == SV_LIGHT_XBOW) || (o_ptr->sval == SV_HEAVY_XBOW))
- show_tohit += (weapon_exp[0][o_ptr->sval])/400;
+ show_tohit += (p_ptr->weapon_exp[0][o_ptr->sval])/400;
else
- show_tohit += (weapon_exp[0][o_ptr->sval]-4000)/200;
+ show_tohit += (p_ptr->weapon_exp[0][o_ptr->sval]-4000)/200;
/* Range attacks */
display_player_one_line(ENTRY_SHOOT_HIT_DAM, format("(%+d,%+d)", show_tohit, show_todam), TERM_L_BLUE);
for (i = 0; i < 4; i++)
{
- put_str(history[i], i + 12, 10);
+ put_str(p_ptr->history[i], i + 12, 10);
}
*statmsg = '\0';
- if (death && total_winner)
+ if (p_ptr->is_dead && p_ptr->total_winner)
{
#ifdef JP
strcpy(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¾¡Íø¤Î¸å°úÂष¤¿¡£");
strcpy(statmsg, "...You retired from the adventure after the winning.");
#endif
}
- else if (death)
+ else if (p_ptr->is_dead)
{
if (dun_level)
{
process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
#ifdef JP
- sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢¥¯¥¨¥¹¥È¡Ö%s¡×¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", quest[p_ptr->inside_quest].name, died_from);
+ sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢¥¯¥¨¥¹¥È¡Ö%s¡×¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", quest[p_ptr->inside_quest].name, p_ptr->died_from);
#else
- sprintf(statmsg, "...You were killed by %s in the quest '%s'.", died_from, quest[p_ptr->inside_quest].name);
+ sprintf(statmsg, "...You were killed by %s in the quest '%s'.", p_ptr->died_from, quest[p_ptr->inside_quest].name);
#endif
}
else
{
#ifdef JP
- sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢%s¤Î%d³¬¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), dun_level, died_from);
+ sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢%s¤Î%d³¬¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), dun_level, p_ptr->died_from);
#else
- sprintf(statmsg, "...You were killed by %s on level %d of %s.", died_from, dun_level, map_name());
+ sprintf(statmsg, "...You were killed by %s on level %d of %s.", p_ptr->died_from, dun_level, map_name());
#endif
}
}
else
#ifdef JP
- sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï%s¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), died_from);
+ sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï%s¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), p_ptr->died_from);
#else
- sprintf(statmsg, "...You were killed by %s in %s.", died_from, map_name());
+ sprintf(statmsg, "...You were killed by %s in %s.", p_ptr->died_from, map_name());
#endif
}
else if (character_dungeon)
char buf[1024];
-#ifndef FAKE_VERSION
- /* Begin dump */
- fprintf(fff, " [Angband %d.%d.%d Character Dump]\n\n",
- VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
-#else
#ifdef JP
fprintf(fff, " [ÊѶòÈÚÅÜ %d.%d.%d ¥¥ã¥é¥¯¥¿¾ðÊó]\n\n",
FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
#endif
-#endif
-
update_playtime();
/* Display player */
if (pet) fprintf(fff, "\n");
}
- if (death && !total_winner)
+ if (p_ptr->is_dead && !p_ptr->total_winner)
{
#ifdef JP
fprintf(fff, "\n [»à¤ÌľÁ°¤Î¥á¥Ã¥»¡¼¥¸]\n\n");
#endif
}
- if (noscore)
+ if (p_ptr->noscore)
#ifdef JP
fprintf(fff, "\n ²¿¤«ÉÔÀµ¤Ê¤³¤È¤ò¤·¤Æ¤·¤Þ¤Ã¤Æ¤Þ¤¹¡£");
#else
flush();
/* Verify Retirement */
- if (total_winner)
+ if (p_ptr->total_winner)
{
/* Verify */
#ifdef JP
}
- if (!noscore)
+ if (!p_ptr->noscore)
{
/* Special Verification for suicide */
#ifdef JP
}
/* Stop playing */
- alive = FALSE;
+ p_ptr->playing = FALSE;
/* Kill the player */
- death = TRUE;
+ p_ptr->is_dead = TRUE;
/* Leaving */
p_ptr->leaving = TRUE;
- if (!total_winner)
+ if (!p_ptr->total_winner)
{
#ifdef JP
do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "¥À¥ó¥¸¥ç¥ó¤Îõº÷¤ËÀä˾¤·¤Æ¼«»¦¤·¤¿¡£");
/* Cause of death */
#ifdef JP
-(void)strcpy(died_from, "ÅÓÃ潪λ");
+(void)strcpy(p_ptr->died_from, "ÅÓÃ潪λ");
#else
- (void)strcpy(died_from, "Quitting");
+ (void)strcpy(p_ptr->died_from, "Quitting");
#endif
}
/* The player is not dead */
#ifdef JP
-(void)strcpy(died_from, "(¥»¡¼¥Ö)");
+(void)strcpy(p_ptr->died_from, "(¥»¡¼¥Ö)");
#else
- (void)strcpy(died_from, "(saved)");
+ (void)strcpy(p_ptr->died_from, "(saved)");
#endif
/* Note that the player is not dead */
#ifdef JP
-(void)strcpy(died_from, "(¸µµ¤¤ËÀ¸¤¤Æ¤¤¤ë)");
+(void)strcpy(p_ptr->died_from, "(¸µµ¤¤ËÀ¸¤¤Æ¤¤¤ë)");
#else
- (void)strcpy(died_from, "(alive and well)");
+ (void)strcpy(p_ptr->died_from, "(alive and well)");
#endif
}
*/
void do_cmd_save_and_exit(void)
{
- alive = FALSE;
+ p_ptr->playing = FALSE;
/* Leaving */
p_ptr->leaving = TRUE;
if ((p_ptr->pseikaku == SEIKAKU_MUNCHKIN) && point)
{
point = 1;
- if (total_winner) point = 2;
+ if (p_ptr->total_winner) point = 2;
}
if (easy_band) point = (0 - point);
/* Ignore wizards and borgs */
- if (!(noscore & 0x00FF))
+ if (!(p_ptr->noscore & 0x00FF))
{
/* Ignore people who die in town */
if (dun_level)
/* King or Queen */
- if (total_winner || (p_ptr->lev > PY_MAX_LEVEL))
+ if (p_ptr->total_winner || (p_ptr->lev > PY_MAX_LEVEL))
{
#ifdef JP
/* ±ÑÆüÀÚ¤êÂؤ¨ */
#ifdef JP
/* Êè¤Ë¹ï¤à¸ÀÍÕ¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¼¨ */
- if (streq(died_from, "ÅÓÃ潪λ"))
+ if (streq(p_ptr->died_from, "ÅÓÃ潪λ"))
{
strcpy(tmp, "<¼«»¦>");
}
else
{
- if (streq(died_from, "ripe"))
+ if (streq(p_ptr->died_from, "ripe"))
{
strcpy(tmp, "°úÂà¸å¤ËÅ·¼÷¤òÁ´¤¦");
}
- else if (streq(died_from, "Seppuku"))
+ else if (streq(p_ptr->died_from, "Seppuku"))
{
strcpy(tmp, "¾¡Íø¤Î¸å¡¢ÀÚÊ¢");
}
else
{
- strcpy(tmp, died_from);
+ strcpy(tmp, p_ptr->died_from);
}
}
center_string(buf, tmp);
put_str(buf, 14, 11);
- if(!streq(died_from, "ripe") && !streq(died_from, "Seppuku"))
+ if(!streq(p_ptr->died_from, "ripe") && !streq(p_ptr->died_from, "Seppuku"))
{
if( dun_level == 0 )
{
cptr town = (p_ptr->town_num ? "³¹" : "¹ÓÌî");
- if(streq(died_from, "ÅÓÃ潪λ"))
+ if(streq(p_ptr->died_from, "ÅÓÃ潪λ"))
{
sprintf(tmp, "%s¤Ç»à¤ó¤À", town);
}
}
else
{
- if(streq(died_from, "ÅÓÃ潪λ"))
+ if(streq(p_ptr->died_from, "ÅÓÃ潪λ"))
{
sprintf(tmp, "Ãϲ¼ %d ³¬¤Ç»à¤ó¤À", dun_level);
}
put_str(buf, 14, 11);
- if (strlen(died_from) > 24)
+ if (strlen(p_ptr->died_from) > 24)
{
- strncpy(dummy, died_from, 24);
+ strncpy(dummy, p_ptr->died_from, 24);
dummy[24] = '\0';
(void)sprintf(tmp, "by %s.", dummy);
}
else
- (void)sprintf(tmp, "by %s.", died_from);
+ (void)sprintf(tmp, "by %s.", p_ptr->died_from);
center_string(buf, tmp);
put_str(buf, 15, 11);
#ifndef SCORE_WIZARDS
/* Wizard-mode pre-empts scoring */
- if (noscore & 0x000F)
+ if (p_ptr->noscore & 0x000F)
{
#ifdef JP
msg_print("¥¦¥£¥¶¡¼¥É¡¦¥â¡¼¥É¤Ç¤Ï¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£");
#ifndef SCORE_BORGS
/* Borg-mode pre-empts scoring */
- if (noscore & 0x00F0)
+ if (p_ptr->noscore & 0x00F0)
{
#ifdef JP
msg_print("¥Ü¡¼¥°¡¦¥â¡¼¥É¤Ç¤Ï¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£");
#ifndef SCORE_CHEATERS
/* Cheaters are not scored */
- if (noscore & 0xFF00)
+ if (p_ptr->noscore & 0xFF00)
{
#ifdef JP
msg_print("º¾µ½¤ò¤ä¤Ã¤¿¿Í¤Ï¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£");
/* Interupted */
#ifdef JP
-if (!total_winner && streq(died_from, "¶¯À©½ªÎ»"))
+if (!p_ptr->total_winner && streq(p_ptr->died_from, "¶¯À©½ªÎ»"))
#else
- if (!total_winner && streq(died_from, "Interrupting"))
+ if (!p_ptr->total_winner && streq(p_ptr->died_from, "Interrupting"))
#endif
{
/* Quitter */
#ifdef JP
-if (!total_winner && streq(died_from, "ÅÓÃ潪λ"))
+if (!p_ptr->total_winner && streq(p_ptr->died_from, "ÅÓÃ潪λ"))
#else
- if (!total_winner && streq(died_from, "Quitting"))
+ if (!p_ptr->total_winner && streq(p_ptr->died_from, "Quitting"))
#endif
{
/* Handle death */
- if (death)
+ if (p_ptr->is_dead)
{
/* Handle retirement */
- if (total_winner) kingly();
+ if (p_ptr->total_winner) kingly();
/* Save memories */
#ifdef JP
if (get_check_strict("Stand by for later score registration? ", (CHECK_NO_ESCAPE | CHECK_NO_HISTORY)))
#endif
{
- wait_report_score = TRUE;
- death = FALSE;
+ p_ptr->wait_report_score = TRUE;
+ p_ptr->is_dead = FALSE;
#ifdef JP
if (!save_player()) msg_print("¥»¡¼¥Ö¼ºÇÔ¡ª");
#else
#endif
}
}
- if (!wait_report_score)
+ if (!p_ptr->wait_report_score)
(void)top_twenty();
}
else if (highscore_fd >= 0)
disturb(1, 0);
/* Mega-Hack -- Delay death */
- if (p_ptr->chp < 0) death = FALSE;
+ if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;
/* Hardcode panic save */
- panic_save = 1;
+ p_ptr->panic_save = 1;
/* Forbid suspend */
signals_ignore_tstp();
/* Indicate panic save */
#ifdef JP
-(void)strcpy(died_from, "(¶ÛµÞ¥»¡¼¥Ö)");
+(void)strcpy(p_ptr->died_from, "(¶ÛµÞ¥»¡¼¥Ö)");
#else
- (void)strcpy(died_from, "(panic save)");
+ (void)strcpy(p_ptr->died_from, "(panic save)");
#endif
/* Terminate dead characters */
- if (death)
+ if (p_ptr->is_dead)
{
/* Mark the savefile */
#ifdef JP
-(void)strcpy(died_from, "¶¯À©½ªÎ»");
+(void)strcpy(p_ptr->died_from, "¶¯À©½ªÎ»");
#else
- (void)strcpy(died_from, "Abortion");
+ (void)strcpy(p_ptr->died_from, "Abortion");
#endif
forget_lite();
{
/* Cause of "death" */
#ifdef JP
-(void)strcpy(died_from, "¶¯À©½ªÎ»Ãæ");
+(void)strcpy(p_ptr->died_from, "¶¯À©½ªÎ»Ãæ");
#else
- (void)strcpy(died_from, "Interrupting");
+ (void)strcpy(p_ptr->died_from, "Interrupting");
#endif
clear_mon_lite();
/* Stop playing */
- alive = FALSE;
+ p_ptr->playing = FALSE;
/* Suicide */
- death = TRUE;
+ p_ptr->is_dead = TRUE;
/* Leaving */
p_ptr->leaving = TRUE;
Term_fresh();
/* Panic Save */
- panic_save = 1;
+ p_ptr->panic_save = 1;
/* Panic save */
#ifdef JP
-(void)strcpy(died_from, "(¶ÛµÞ¥»¡¼¥Ö)");
+(void)strcpy(p_ptr->died_from, "(¶ÛµÞ¥»¡¼¥Ö)");
#else
- (void)strcpy(died_from, "(panic save)");
+ (void)strcpy(p_ptr->died_from, "(panic save)");
#endif
OSDN Git Service
