mirror of
https://github.com/paxed/dgamelaunch.git
synced 2025-07-31 01:24:43 +02:00
Pedantry, c/o paxed
git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@203 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
parent
9072f9c8db
commit
1c777df980
@ -181,7 +181,7 @@ create_config ()
|
|||||||
myconfig->shed_gid = defconfig.shed_gid;
|
myconfig->shed_gid = defconfig.shed_gid;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myconfig->max == 0) myconfig->max = defconfig.max;
|
if (myconfig->max == -1) myconfig->max = defconfig.max;
|
||||||
if (!myconfig->banner) myconfig->banner = defconfig.banner;
|
if (!myconfig->banner) myconfig->banner = defconfig.banner;
|
||||||
if (!myconfig->chroot) myconfig->chroot = defconfig.chroot;
|
if (!myconfig->chroot) myconfig->chroot = defconfig.chroot;
|
||||||
if (!myconfig->nethack) myconfig->nethack = defconfig.nethack;
|
if (!myconfig->nethack) myconfig->nethack = defconfig.nethack;
|
||||||
@ -504,7 +504,7 @@ inprogressmenu ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
mvaddstr (23, 1,
|
mvaddstr (23, 1,
|
||||||
"Watch which game? (r refreshes, q quits, >/< for more/less) => ");
|
"Watch which game? ('r' refreshes, 'q' quits, '>'/'<' for more/less) => ");
|
||||||
refresh ();
|
refresh ();
|
||||||
|
|
||||||
switch ((menuchoice = tolower (getch ())))
|
switch ((menuchoice = tolower (getch ())))
|
||||||
@ -1139,7 +1139,7 @@ write_canned_rcfile (char *target)
|
|||||||
{
|
{
|
||||||
bail:
|
bail:
|
||||||
mvaddstr (13, 1,
|
mvaddstr (13, 1,
|
||||||
"You don't know how to write that! You write \"%s\" was here and the scroll disappears.");
|
"You don't know how to write that! You write \"%s was here\" and the scroll disappears.");
|
||||||
mvaddstr (14, 1,
|
mvaddstr (14, 1,
|
||||||
"(Sorry, but I couldn't open one of the nethackrc files. This is a bug.)");
|
"(Sorry, but I couldn't open one of the nethackrc files. This is a bug.)");
|
||||||
return;
|
return;
|
||||||
@ -1356,15 +1356,16 @@ purge_stale_locks (void)
|
|||||||
clear ();
|
clear ();
|
||||||
drawbanner (1, 1);
|
drawbanner (1, 1);
|
||||||
|
|
||||||
mvaddstr (3, 1,
|
#define HUP_WAIT 10 /* seconds before HUPPING */
|
||||||
"There are some stale Nethack processes, will recover in 5 seconds.");
|
mvprintw (3, 1,
|
||||||
|
"There are some stale Nethack processes, will recover in %d seconds.", HUP_WAIT);
|
||||||
mvaddstr (4, 1,
|
mvaddstr (4, 1,
|
||||||
"Press a key NOW if you don't want this to happen!");
|
"Press a key NOW if you don't want this to happen!");
|
||||||
|
|
||||||
move (3, 58); /* pedantry */
|
move (3, 58); /* pedantry */
|
||||||
halfdelay(10);
|
halfdelay(10);
|
||||||
|
|
||||||
for (seconds = 5; seconds > 0; seconds--)
|
for (seconds = HUP_WAIT - 1; seconds >= 0; seconds--)
|
||||||
{
|
{
|
||||||
if (getch() != ERR)
|
if (getch() != ERR)
|
||||||
{
|
{
|
||||||
@ -1372,7 +1373,7 @@ purge_stale_locks (void)
|
|||||||
cbreak();
|
cbreak();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
mvaddch (3, 57, (char)(seconds + '0') - 1);
|
mvprintw (3, 57, "%d%s", seconds, (seconds > 9) ? "" : " ");
|
||||||
}
|
}
|
||||||
|
|
||||||
nocbreak();
|
nocbreak();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user