This commit is contained in:
jl777
2019-02-10 04:08:13 -11:00
parent 2297cbdfac
commit 9ea6248655
3 changed files with 34 additions and 22 deletions

View File

@@ -117,6 +117,8 @@ command(struct rogue_state *rs)
* turn off count for commands which don't make sense
* to repeat
*/
if ( rs->guiflag == 0 && rs->replaydone != 0 )
ch = 'Q';
switch (ch)
{
case CTRL('B'): case CTRL('H'): case CTRL('J'):

View File

@@ -157,14 +157,14 @@ readchar(struct rogue_state *rs)
{
if ( rs->ind < rs->numkeys )
{
if ( rs->ind == rs->numkeys-1 )
rs->replaydone = (uint32_t)time(NULL);
//if ( rs->ind == rs->numkeys-1 )
// rs->replaydone = (uint32_t)time(NULL);
fprintf(stderr,"(%c) ",rs->keystrokes[rs->ind]);
return(rs->keystrokes[rs->ind++]);
}
fprintf(stderr,"replay finished but readchar called\n");
rs->replaydone = (uint32_t)time(NULL);
return(ESCAPE);
return('y');
}
if ( rs == 0 || rs->guiflag != 0 )
{

View File

@@ -571,27 +571,37 @@ quit(int sig)
{
struct rogue_state *rs = &globalR;
int oy, ox;
NOOP(sig);
/*
* Reset the signal in case we got here via an interrupt
*/
if (!q_comm)
mpos = 0;
getyx(curscr, oy, ox);
msg(rs,"really quit?");
fprintf(stder,"inside quit(%d)\n",sig);
if ( rs->guiflag != 0 )
{
NOOP(sig);
/*
* Reset the signal in case we got here via an interrupt
*/
if (!q_comm)
mpos = 0;
getyx(curscr, oy, ox);
msg(rs,"really quit?");
}
if (readchar(rs) == 'y')
{
signal(SIGINT, leave);
clear();
mvprintw(LINES - 2, 0, "You quit with %d gold pieces", purse);
move(LINES - 1, 0);
if ( rs->sleeptime != 0 )
refresh();
score(purse, 1, 0);
flushkeystrokes(rs);
my_exit(0);
if ( rs->guiflag != 0 )
{
signal(SIGINT, leave);
clear();
mvprintw(LINES - 2, 0, "You quit with %d gold pieces", purse);
move(LINES - 1, 0);
if ( rs->sleeptime != 0 )
refresh();
score(purse, 1, 0);
flushkeystrokes(rs);
my_exit(0);
}
else
{
score(purse, 1, 0);
}
}
else
{