Rename terminate to nh_terminate so VS2015 can compile
This commit is contained in:
@@ -4039,7 +4039,7 @@ void NetHackQtMainWindow::closeEvent(QCloseEvent* e)
|
||||
if (dosave0()) {
|
||||
u.uhp = -1;
|
||||
NetHackQtBind::qt_exit_nhwindows(0);
|
||||
terminate(EXIT_SUCCESS);
|
||||
nh_terminate(EXIT_SUCCESS);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
@@ -4639,7 +4639,7 @@ void NetHackQtBind::qt_askname()
|
||||
// Quit
|
||||
clearlocks();
|
||||
qt_exit_nhwindows(0);
|
||||
terminate(0);
|
||||
nh_terminate(0);
|
||||
}
|
||||
|
||||
void NetHackQtBind::qt_get_nh_event()
|
||||
|
||||
@@ -370,7 +370,7 @@ X11_player_selection()
|
||||
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||
clearlocks();
|
||||
X11_exit_nhwindows((char *) 0);
|
||||
terminate(0);
|
||||
nh_terminate(0);
|
||||
} else if (ps_selected == PS_RANDOM) {
|
||||
flags.initrole = ROLE_RANDOM;
|
||||
} else if (ps_selected < 0 || ps_selected >= num_roles) {
|
||||
@@ -439,7 +439,7 @@ X11_player_selection()
|
||||
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||
clearlocks();
|
||||
X11_exit_nhwindows((char *) 0);
|
||||
terminate(0);
|
||||
nh_terminate(0);
|
||||
} else if (ps_selected == PS_RANDOM) {
|
||||
flags.initrace = ROLE_RANDOM;
|
||||
} else if (ps_selected < 0 || ps_selected >= num_races) {
|
||||
@@ -507,7 +507,7 @@ X11_player_selection()
|
||||
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||
clearlocks();
|
||||
X11_exit_nhwindows((char *) 0);
|
||||
terminate(0);
|
||||
nh_terminate(0);
|
||||
} else if (ps_selected == PS_RANDOM) {
|
||||
flags.initgend = ROLE_RANDOM;
|
||||
} else if (ps_selected < 0 || ps_selected >= num_gends) {
|
||||
@@ -573,7 +573,7 @@ X11_player_selection()
|
||||
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||
clearlocks();
|
||||
X11_exit_nhwindows((char *) 0);
|
||||
terminate(0);
|
||||
nh_terminate(0);
|
||||
} else if (ps_selected == PS_RANDOM) {
|
||||
flags.initalign = ROLE_RANDOM;
|
||||
} else if (ps_selected < 0 || ps_selected >= num_algns) {
|
||||
|
||||
@@ -129,7 +129,7 @@ const char *mesg;
|
||||
{
|
||||
clearlocks();
|
||||
Gem_exit_nhwindows(mesg);
|
||||
terminate(EXIT_SUCCESS);
|
||||
nh_terminate(EXIT_SUCCESS);
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
|
||||
|
||||
@@ -221,7 +221,7 @@ const char *mesg;
|
||||
{
|
||||
clearlocks();
|
||||
tty_exit_nhwindows(mesg);
|
||||
terminate(EXIT_SUCCESS);
|
||||
nh_terminate(EXIT_SUCCESS);
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
|
||||
@@ -2663,7 +2663,7 @@ boolean complain;
|
||||
}
|
||||
if (complain)
|
||||
sleep(10); /* want to wait_synch() but stdin is gone */
|
||||
terminate(EXIT_FAILURE);
|
||||
nh_terminate(EXIT_FAILURE);
|
||||
}
|
||||
(void) close(fd);
|
||||
#ifdef notyet
|
||||
|
||||
@@ -2067,7 +2067,7 @@ bail(const char *mesg)
|
||||
{
|
||||
clearlocks();
|
||||
mswin_exit_nhwindows(mesg);
|
||||
terminate(EXIT_SUCCESS);
|
||||
nh_terminate(EXIT_SUCCESS);
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user